Commit 5e955968 authored by Giuseppe Cavallaro's avatar Giuseppe Cavallaro Committed by David S. Miller

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: default avatarVlad Lungu <vlad.lungu@windriver.com>
Signed-off-by: default avatarGiuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent de855b99
...@@ -1846,13 +1846,6 @@ static int stmmac_resume(struct device *dev) ...@@ -1846,13 +1846,6 @@ static int stmmac_resume(struct device *dev)
if (!netif_running(ndev)) if (!netif_running(ndev))
return 0; 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); spin_lock(&priv->lock);
/* Power Down bit, into the PM register, is cleared /* Power Down bit, into the PM register, is cleared
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment