UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Fugang Duan <B38611@freescale.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Russell King 2014-07-08 12:40:02 +01:00 committed by David S. Miller
parent da1774e5f1
commit 8bbbd3c19c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ethernet/freescale/fec_main.c
View File

@ -2197,10 +2197,10 @@ fec_enet_close(struct net_device *ndev)
phy_stop(fep->phy_dev);
/* Don't know what to do yet. */
napi_disable(&fep->napi);
netif_tx_disable(ndev);
fec_stop(ndev);
if (netif_device_present(ndev))
fec_stop(ndev);
phy_disconnect(fep->phy_dev);
fep->phy_dev = NULL;