diff options
| author |   David S. Miller <davem@davemloft.net> | 2020-09-17 16:55:35 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-09-17 16:55:35 -0700 |
| commit | 0dfdbc7440870007818277dc02d20d4794178a4f (patch) | |
| tree | 18036fd8155a82d365bff85350c52bdce072bfcb /drivers/net | |
| parent | ethtool: add and use message type for tunnel info reply (diff) | |
| parent | net: phy: Do not warn in phy_stop() on PHY_DOWN (diff) | |
| download | linux-dev-0dfdbc7440870007818277dc02d20d4794178a4f.tar.xz linux-dev-0dfdbc7440870007818277dc02d20d4794178a4f.zip | |
Merge branch 'net-phy-Unbind-fixes'
Florian Fainelli says:
====================
net: phy: Unbind fixes
This patch series fixes a couple of issues with the unbinding of the PHY
drivers and then bringing down a network interface. The first is a NULL
pointer de-reference and the second was an incorrect warning being
triggered.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/phy/phy.c | 2 | ||||
| -rw-r--r-- | drivers/net/phy/phy_device.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 735a806045ac..8947d58f2a25 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -996,7 +996,7 @@ void phy_stop(struct phy_device *phydev) { struct net_device *dev = phydev->attached_dev; - if (!phy_is_started(phydev)) { + if (!phy_is_started(phydev) && phydev->state != PHY_DOWN) { WARN(1, "called from state %s\n", phy_state_to_str(phydev->state)); return; diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index b93b40cda54a..5dab6be6fc38 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -1682,7 +1682,8 @@ void phy_detach(struct phy_device *phydev) phy_led_triggers_unregister(phydev); - module_put(phydev->mdio.dev.driver->owner); + if (phydev->mdio.dev.driver) + module_put(phydev->mdio.dev.driver->owner); /* If the device had no specific driver before (i.e. - it * was using the generic driver), we unbind the device |