diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2010-09-19 23:48:00 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2010-09-19 23:48:32 -0400 |
| commit | c88739b373e4930ed082a607cb78bf82616fd076 (patch) | |
| tree | 251d969aa816dab5a62e6b36208b189b37de6534 /drivers/net/stmmac/stmmac_main.c | |
| parent | 3211af1119174fbe8b676422b74870cdd51d7314 (diff) | |
| parent | 827e3457022d0bb0b1bb8a0eb88501876fe7dcf0 (diff) | |
Merge remote branch 'trond/bugfixes' into for-2.6.37
Without some client-side fixes, server testing is currently difficult.
Diffstat (limited to 'drivers/net/stmmac/stmmac_main.c')
| -rw-r--r-- | drivers/net/stmmac/stmmac_main.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/stmmac/stmmac_main.c b/drivers/net/stmmac/stmmac_main.c index bbb7951b9c4..ea0461eb2db 100644 --- a/drivers/net/stmmac/stmmac_main.c +++ b/drivers/net/stmmac/stmmac_main.c @@ -1865,15 +1865,15 @@ static int stmmac_resume(struct platform_device *pdev) if (!netif_running(dev)) return 0; - spin_lock(&priv->lock); - if (priv->shutdown) { /* Re-open the interface and re-init the MAC/DMA - and the rings. */ + and the rings (i.e. on hibernation stage) */ stmmac_open(dev); - goto out_resume; + return 0; } + spin_lock(&priv->lock); + /* Power Down bit, into the PM register, is cleared * automatically as soon as a magic packet or a Wake-up frame * is received. Anyway, it's better to manually clear @@ -1901,7 +1901,6 @@ static int stmmac_resume(struct platform_device *pdev) netif_start_queue(dev); -out_resume: spin_unlock(&priv->lock); return 0; } |