From b0f857ddae6b879aacee19de6c309793b28fc6ab Mon Sep 17 00:00:00 2001 From: Giuseppe Cavallaro Date: Sun, 28 Nov 2010 18:10:53 -0800 Subject: [PATCH] --- yaml --- r: 224535 b: refs/heads/master c: 5e9559689735f760f3a1fb9b2aafeb4d8efbf8f5 h: refs/heads/master i: 224533: be23ec64b77be7dacb267698a8aef26a5f549c70 224531: c97ebfa61a6b9ce3f630bbf09ddd2f7ba701ebc7 224527: 0361065605f804cedc1691b78cc2e2c13cb44fee v: v3 --- [refs] | 2 +- trunk/drivers/net/stmmac/stmmac_main.c | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 8fde1e476117..52905fadb80d 100644 --- 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 index f1dbc182c8df..730a6fd79ee0 100644 --- 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