]> www.infradead.org Git - users/jedix/linux-maple.git/commit
net: phylink: move phy_device_free() to correctly release phy device
authorClément Léger <clement.leger@bootlin.com>
Tue, 31 Jan 2023 10:02:42 +0000 (11:02 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 14 Feb 2023 18:11:43 +0000 (19:11 +0100)
commita65723e299dc0fea45d8160590f8c0e109405579
tree910ce1a82bd062e764ed0b1bd2e482eb096a61c7
parenta7f0ec26cd67e7ad6e56753694fddb67a9730f27
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>
drivers/net/phy/phylink.c