mirror of
https://github.com/raspberrypi/linux.git
synced 2025-12-06 18:09:56 +00:00
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:
committed by
Greg Kroah-Hartman
parent
b21abc775d
commit
d14d408060
@@ -2489,9 +2489,6 @@ static int velocity_close(struct net_device *dev)
|
|||||||
if (dev->irq != 0)
|
if (dev->irq != 0)
|
||||||
free_irq(dev->irq, dev);
|
free_irq(dev->irq, dev);
|
||||||
|
|
||||||
/* Power down the chip */
|
|
||||||
pci_set_power_state(vptr->pdev, PCI_D3hot);
|
|
||||||
|
|
||||||
velocity_free_rings(vptr);
|
velocity_free_rings(vptr);
|
||||||
|
|
||||||
vptr->flags &= (~VELOCITY_FLAGS_OPENED);
|
vptr->flags &= (~VELOCITY_FLAGS_OPENED);
|
||||||
|
|||||||
Reference in New Issue
Block a user