[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <1290740072-1341-1-git-send-email-peppe.cavallaro@st.com>
Date: Fri, 26 Nov 2010 15:11:45 +0100
From: Peppe CAVALLARO <peppe.cavallaro@...com>
To: "netdev@...r.kernel.org" <netdev@...r.kernel.org>
Cc: "vlad.lungu@...driver.com" <vlad.lungu@...driver.com>,
Peppe CAVALLARO <peppe.cavallaro@...com>
Subject: [PATCH] stmmac: fix stmmac_resume removing not yet used shutdown
flag
The commit to convert to use the dev_pm_ops struct
introduces a bug. The shutdown flag is not yet used
because the hibernation on memory is done by using
the freeze callback.
Thanks to Vlad for having reported it.
Reported-by: Vlad Lungu <vlad.lungu@...driver.com>
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@...com>
---
drivers/net/stmmac/stmmac_main.c | 7 -------
1 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/drivers/net/stmmac/stmmac_main.c b/drivers/net/stmmac/stmmac_main.c
index f1dbc18..730a6fd 100644
--- a/drivers/net/stmmac/stmmac_main.c
+++ b/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
--
1.5.5.6
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists