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@windriver.com>
Signed-off-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Giuseppe Cavallaro 2010-11-28 18:10:53 -08:00 committed by David S. Miller
parent de855b992d
commit 5e95596897

View 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