summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorZeng Zhaoming <b32542@freescale.com>2010-12-14 11:43:21 +0800
committerAlan Tull <alan.tull@freescale.com>2011-02-03 16:35:04 -0600
commit09d00f73af70b8d08aede9d913f82f07f82b5d09 (patch)
treec0f3172e11f7ef4216376e0e58fce20a98735fed /drivers/net
parent8c11eaf816dad71ca4c8a9ce3c67d503b3ad600a (diff)
ENGR00136942 FEC: Fix resume fec trigger transmit timeout
Set carrier flag to off when suspend, to avoid kernel warning about sending timeout. Reported-by: Peter Chen <peter.chen@freescale.com> Tested-by: Peter Chen <peter.chen@freescale.com> Signed-off-by: Zeng Zhaoming <b32542@freescale.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/fec.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/fec.c b/drivers/net/fec.c
index 2f159b56fc67..d0e2e690b66e 100644
--- a/drivers/net/fec.c
+++ b/drivers/net/fec.c
@@ -1608,7 +1608,8 @@ fec_suspend(struct platform_device *dev, pm_message_t state)
if (netif_running(ndev)) {
netif_device_detach(ndev);
fec_stop(ndev);
- clk_disable(fep->clk);
+ netif_carrier_off(ndev);
+ clk_disable(fep->clk);
}
}
return 0;