Commit 8bbbd3c1 authored by Russell King's avatar Russell King Committed by David S. Miller

net: fec: ensure fec_enet_close() copes with resume failure

When the FEC is suspended, the device is detached.  Upon resume failure,
the device is left in detached mode, possibly with some of the required
clocks not running.  We don't want to be poking the device in that state
because as it may cause bus errors.

If the device is marked detached, avoid calling fec_stop().

This depends upon: "net:fec: improve safety of suspend/resume paths"
Acked-by: default avatarFugang Duan <B38611@freescale.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent da1774e5
...@@ -2197,10 +2197,10 @@ fec_enet_close(struct net_device *ndev) ...@@ -2197,10 +2197,10 @@ fec_enet_close(struct net_device *ndev)
phy_stop(fep->phy_dev); phy_stop(fep->phy_dev);
/* Don't know what to do yet. */
napi_disable(&fep->napi); napi_disable(&fep->napi);
netif_tx_disable(ndev); netif_tx_disable(ndev);
fec_stop(ndev); if (netif_device_present(ndev))
fec_stop(ndev);
phy_disconnect(fep->phy_dev); phy_disconnect(fep->phy_dev);
fep->phy_dev = NULL; fep->phy_dev = NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment