Patchwork [net,1/1] via-velocity: S3 resume fix.

login
register
mail settings
Submitter françois romieu
Date Feb. 5, 2012, 9:12 a.m.
Message ID <20120205091236.GA18774@electric-eye.fr.zoreil.com>
Download mbox | patch
Permalink /patch/139614/
State Superseded
Delegated to: David Miller
Headers show

Comments

françois romieu - Feb. 5, 2012, 9:12 a.m.
From: David Lv (DavidLv@viatech.com.cn)

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>
---
 drivers/net/ethernet/via/via-velocity.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

Patch

diff --git a/drivers/net/ethernet/via/via-velocity.c b/drivers/net/ethernet/via/via-velocity.c
index 4128d6b..cb35b14 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);