diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2025-05-28 10:03:53 +0200 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2025-05-28 10:11:15 +0200 |
| commit | f6bd8faeb113c8ab783466bc5bc1a5442ae85176 (patch) | |
| tree | 21a67177c1e5f4877523e40428c1ce2a35aa1cc5 /drivers/net/phy/phy_device.c | |
| parent | acea6b132d813a12ac414f6b1efb05921623afc0 (diff) | |
| parent | 57a92d14659df3e7e7e0052358c8cc68bbbc3b5e (diff) | |
| download | lwn-f6bd8faeb113c8ab783466bc5bc1a5442ae85176.tar.gz lwn-f6bd8faeb113c8ab783466bc5bc1a5442ae85176.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Merge in late fixes to prepare for the 6.16 net-next PR.
No conflicts nor adjacent changes.
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'drivers/net/phy/phy_device.c')
| -rw-r--r-- | drivers/net/phy/phy_device.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 0f6f86252622..73f9cb2e2844 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -1749,8 +1749,10 @@ void phy_detach(struct phy_device *phydev) struct module *ndev_owner = NULL; struct mii_bus *bus; - if (phydev->devlink) + if (phydev->devlink) { device_link_del(phydev->devlink); + phydev->devlink = NULL; + } if (phydev->sysfs_links) { if (dev) |