diff options
| author | David Lv <DavidLv@viatech.com.cn> | 2012-02-04 23:22:26 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-02-05 17:47:09 -0500 |
| commit | b530b1930bbd9d005345133f0ff0c556d2a52b19 (patch) | |
| tree | c262ab2706a67a5aad50fa95cdaaa6df29a5e418 | |
| parent | e6b45241c57a83197e5de9166b3b0d32ac562609 (diff) | |
| download | linux-b530b1930bbd9d005345133f0ff0c556d2a52b19.tar.gz linux-b530b1930bbd9d005345133f0ff0c556d2a52b19.tar.bz2 linux-b530b1930bbd9d005345133f0ff0c556d2a52b19.zip | |
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>
| -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) if (dev->irq != 0) free_irq(dev->irq, dev); - /* Power down the chip */ - pci_set_power_state(vptr->pdev, PCI_D3hot); - velocity_free_rings(vptr); vptr->flags &= (~VELOCITY_FLAGS_OPENED); |