Ver código fonte

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>
Russell King 11 anos atrás
pai
commit
8bbbd3c19c
1 arquivos alterados com 2 adições e 2 exclusões
  1. 2 2
      drivers/net/ethernet/freescale/fec_main.c

+ 2 - 2
drivers/net/ethernet/freescale/fec_main.c

@@ -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;