From 6b73ec92024bc3d9528983d2b5d0a5fbe8c018ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>
Date: Wed, 2 Jun 2010 06:13:34 -0700
Subject: [PATCH] --- yaml --- r: 200149 b: refs/heads/master c:
 e3fe8558c7fc182972c3d947d88744482111f304 h: refs/heads/master i:   200147:
 5fc3d20a4922e2caff3fc4f9f6fcd751ddb6c392 v: v3

---
 [refs]                  |  2 +-
 trunk/drivers/net/fec.c | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 97aa5f47b445..83bfa2d50e87 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b1011b375be106e0a312baafc981a26165283efe
+refs/heads/master: e3fe8558c7fc182972c3d947d88744482111f304
diff --git a/trunk/drivers/net/fec.c b/trunk/drivers/net/fec.c
index ddf7a86cd466..edfff92a6d8e 100644
--- a/trunk/drivers/net/fec.c
+++ b/trunk/drivers/net/fec.c
@@ -1373,10 +1373,9 @@ fec_suspend(struct platform_device *dev, pm_message_t state)
 
 	if (ndev) {
 		fep = netdev_priv(ndev);
-		if (netif_running(ndev)) {
-			netif_device_detach(ndev);
-			fec_stop(ndev);
-		}
+		if (netif_running(ndev))
+			fec_enet_close(ndev);
+		clk_disable(fep->clk);
 	}
 	return 0;
 }
@@ -1385,12 +1384,13 @@ static int
 fec_resume(struct platform_device *dev)
 {
 	struct net_device *ndev = platform_get_drvdata(dev);
+	struct fec_enet_private *fep;
 
 	if (ndev) {
-		if (netif_running(ndev)) {
-			fec_enet_init(ndev, 0);
-			netif_device_attach(ndev);
-		}
+		fep = netdev_priv(ndev);
+		clk_enable(fep->clk);
+		if (netif_running(ndev))
+			fec_enet_open(ndev);
 	}
 	return 0;
 }