net: phylink: move phy_device_free() to correctly release phy device

[ Upstream commit ce93fdb5f2ca5c9e2a9668411cc39091507f8dc9 ]

After calling fwnode_phy_find_device(), the phy device refcount is
incremented. Then, when the phy device is attached to a netdev with
phy_attach_direct(), the refcount is also incremented but only
decremented in the caller if phy_attach_direct() fails. Move
phy_device_free() before the "if" to always release it correctly.
Indeed, either phy_attach_direct() failed and we don't want to keep a
reference to the phydev or it succeeded and a reference has been taken
internally.

Fixes: 25396f680dd6 ("net: phylink: introduce phylink_fwnode_phy_connect()")
Signed-off-by: Clément Léger <clement.leger@bootlin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index 7afcf6310d59f3e9cf2e9b1e36e482b235b520d5..422dc92ecac9453796303db28d7710c87406892b 100644 (file)
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -1166,10 +1166,9 @@ int phylink_fwnode_phy_connect(struct phylink *pl,
 
        ret = phy_attach_direct(pl->netdev, phy_dev, flags,
                                pl->link_interface);
-       if (ret) {
-               phy_device_free(phy_dev);
+       phy_device_free(phy_dev);
+       if (ret)
                return ret;
-       }
 
        ret = phylink_bringup_phy(pl, phy_dev, pl->link_config.interface);
        if (ret)