diff options
author | Florian Fainelli <f.fainelli@gmail.com> | 2017-02-17 16:07:33 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-02-20 10:15:11 -0500 |
commit | 7b9a88a390dacb37b051a7b09b9a08f546edf5eb (patch) | |
tree | f0fa1a1f8d52494f4f60b6aea4a098e2969a1753 /drivers/net | |
parent | cd2b708750582e327789d8fb07c6eb5f79f7759f (diff) |
net: phy: Fix PHY unbind crash
The PHY library does not deal very well with bind and unbind events. The first
thing we would see is that we were not properly canceling the PHY state machine
workqueue, so we would be crashing while dereferencing phydev->drv since there
is no driver attached anymore.
Suggested-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/phy/phy_device.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 8c8e15b8739d..7f9319586b7e 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -1784,6 +1784,8 @@ static int phy_remove(struct device *dev) { struct phy_device *phydev = to_phy_device(dev); + cancel_delayed_work_sync(&phydev->state_queue); + mutex_lock(&phydev->lock); phydev->state = PHY_DOWN; mutex_unlock(&phydev->lock); |