stmmac: fix stmmac_resume removing not yet used shutdown flag
authorGiuseppe Cavallaro <peppe.cavallaro@st.com>
Mon, 29 Nov 2010 02:10:53 +0000 (18:10 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 29 Nov 2010 02:10:53 +0000 (18:10 -0800)
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@windriver.com>
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/stmmac/stmmac_main.c

index f1dbc18..730a6fd 100644 (file)
@@ -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