diff options
author | David Lv <DavidLv@viatech.com.cn> | 2012-02-04 18:22:26 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-02-05 17:47:09 -0500 |
commit | b530b1930bbd9d005345133f0ff0c556d2a52b19 (patch) | |
tree | c262ab2706a67a5aad50fa95cdaaa6df29a5e418 /drivers/net | |
parent | e6b45241c57a83197e5de9166b3b0d32ac562609 (diff) |
via-velocity: S3 resume fix.
Initially diagnosed on Ubuntu 11.04 with kernel 2.6.38.
velocity_close is not called during a suspend / resume cycle in this
driver and it has no business playing directly with power states.
Signed-off-by: David Lv <DavidLv@viatech.com.cn>
Acked-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/ethernet/via/via-velocity.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/ethernet/via/via-velocity.c b/drivers/net/ethernet/via/via-velocity.c index 4128d6b8cc28..cb35b14b73bb 100644 --- a/drivers/net/ethernet/via/via-velocity.c +++ b/drivers/net/ethernet/via/via-velocity.c | |||
@@ -2491,9 +2491,6 @@ static int velocity_close(struct net_device *dev) | |||
2491 | if (dev->irq != 0) | 2491 | if (dev->irq != 0) |
2492 | free_irq(dev->irq, dev); | 2492 | free_irq(dev->irq, dev); |
2493 | 2493 | ||
2494 | /* Power down the chip */ | ||
2495 | pci_set_power_state(vptr->pdev, PCI_D3hot); | ||
2496 | |||
2497 | velocity_free_rings(vptr); | 2494 | velocity_free_rings(vptr); |
2498 | 2495 | ||
2499 | vptr->flags &= (~VELOCITY_FLAGS_OPENED); | 2496 | vptr->flags &= (~VELOCITY_FLAGS_OPENED); |