diff options
| author | Giuseppe Cavallaro <peppe.cavallaro@st.com> | 2010-11-29 03:10:53 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-11-29 03:10:53 +0100 |
| commit | 5e9559689735f760f3a1fb9b2aafeb4d8efbf8f5 (patch) | |
| tree | d951984c06fd439ae18e90cacd8c61f602b4a383 /drivers/net/stmmac | |
| parent | forcedeth: use usleep_range not msleep for small sleeps (diff) | |
| download | linux-5e9559689735f760f3a1fb9b2aafeb4d8efbf8f5.tar.xz linux-5e9559689735f760f3a1fb9b2aafeb4d8efbf8f5.zip | |
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>
Diffstat (limited to 'drivers/net/stmmac')
| -rw-r--r-- | 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 f1dbc182c8df..730a6fd79ee0 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 |