Commit ce93fdb5 authored by Clément Léger's avatar Clément Léger Committed by David S. Miller
Browse files

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: 25396f68 ("net: phylink: introduce phylink_fwnode_phy_connect()")
Signed-off-by: default avatarClément Léger <clement.leger@bootlin.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent edb9b8f3

drivers/net/phy/phylink.c

+2 −3
Original line number Diff line number Diff line
@@ -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);

	if (ret)

		return ret;

	}



	ret = phylink_bringup_phy(pl, phy_dev, pl->link_config.interface);

	if (ret)