via-velocity: S3 resume fix.

[ Upstream commit b530b1930b ]

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>
This commit is contained in:
David Lv
2012-02-04 23:22:26 +00:00
committed by Greg Kroah-Hartman
parent b21abc775d
commit d14d408060

View File

@@ -2489,9 +2489,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);