Skip to content

Commit

Permalink
stmmac: fix stmmac_resume removing not yet used shutdown flag
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Giuseppe Cavallaro authored and David S. Miller committed Nov 29, 2010
1 parent de855b9 commit 5e95596
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions drivers/net/stmmac/stmmac_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 5e95596

Please sign in to comment.