diff options
| author | Clément Léger <clement.leger@bootlin.com> | 2023-01-31 13:02:42 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2023-02-03 12:13:53 +0300 |
| commit | ce93fdb5f2ca5c9e2a9668411cc39091507f8dc9 (patch) | |
| tree | c6dc4f05a63c75031677976545deb6c6b81ef96b | |
| parent | edb9b8f380c3413bf783475279b1a941c7e5cec1 (diff) | |
| download | linux-ce93fdb5f2ca5c9e2a9668411cc39091507f8dc9.tar.xz | |
net: phylink: move phy_device_free() to correctly release phy device
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>
| -rw-r--r-- | drivers/net/phy/phylink.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c index 09cc65c0da93..4d2519cdb801 100644 --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c @@ -1812,10 +1812,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) |