diff options
| author | Hagen Paul Pfeifer <hagen@jauu.net> | 2012-02-04 23:22:26 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-29 16:34:08 -0800 |
| commit | d67f60702b0085eb2ad772b9f7ddf728fc42d7b8 (patch) | |
| tree | 22da16de52d25283c4f2f6df2cf79ab6aef3198f /drivers/net/via-velocity.c | |
| parent | 1609e23b0c313d58664bcc0677eadd9464c8c2cc (diff) | |
| download | kernel_samsung_tuna-d67f60702b0085eb2ad772b9f7ddf728fc42d7b8.zip kernel_samsung_tuna-d67f60702b0085eb2ad772b9f7ddf728fc42d7b8.tar.gz kernel_samsung_tuna-d67f60702b0085eb2ad772b9f7ddf728fc42d7b8.tar.bz2 | |
via-velocity: S3 resume fix.
[ Upstream commit b530b1930bbd9d005345133f0ff0c556d2a52b19 ]
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/via-velocity.c')
| -rw-r--r-- | drivers/net/via-velocity.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c index 06daa9d..c7e4934 100644 --- a/drivers/net/via-velocity.c +++ b/drivers/net/via-velocity.c @@ -2513,9 +2513,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); |