diff mbox

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

Message ID 20120205092226.GB18774@electric-eye.fr.zoreil.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Francois Romieu Feb. 5, 2012, 9:22 a.m. UTC 
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>
---

 David L., please don't put anything but a valid email address in
 your S-o-b line when you send patches (no parenthesis, plain bracket).
 Thanks.

 drivers/net/ethernet/via/via-velocity.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

Comments

David Miller Feb. 5, 2012, 10:47 p.m. UTC | #1 
From: Francois Romieu <romieu@fr.zoreil.com>
Date: Sun, 5 Feb 2012 10:22:26 +0100

> 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>

Applied and queued up for -stable, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

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);