---

yaml --- r: 224535 b: refs/heads/master c: 5e95596 h: refs/heads/master i: 224533: be23ec6 224531: c97ebfa 224527: 0361065 v: v3
git-mirror · Nov 29, 2010 · b0f857d · b0f857d
1 parent ad05c38
commit b0f857d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de855b992d75e49816eb09231764e7a63a4f555d
+refs/heads/master: 5e9559689735f760f3a1fb9b2aafeb4d8efbf8f5
diff --git a/trunk/drivers/net/stmmac/stmmac_main.c b/trunk/drivers/net/stmmac/stmmac_main.c
@@ -1846,13 +1846,6 @@ static int stmmac_resume(struct device *dev)
 	if (!netif_running(ndev))
 		return 0;
 
-	if (priv->shutdown) {
-		/* Re-open the interface and re-init the MAC/DMA
-		   and the rings (i.e. on hibernation stage) */
-		stmmac_open(dev);
-		return 0;
-	}
-
 	spin_lock(&priv->lock);
 
 	/* Power Down bit, into the PM register, is cleared