projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
26ec43f
)
[PATCH] sky2: save/restore base hardware irq during suspend/resume
author
Stephen Hemminger
<shemminger@osdl.org>
Tue, 13 Jun 2006 08:17:30 +0000
(17:17 +0900)
committer
Linus Torvalds
<torvalds@g5.osdl.org>
Tue, 13 Jun 2006 20:16:41 +0000
(13:16 -0700)
The hardware should be fully shut off during suspend, and the base
irq mask restored during resume.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/net/sky2.c
patch
|
blob
|
blame
|
history
diff --git
a/drivers/net/sky2.c
b/drivers/net/sky2.c
index b680e64ad2ca33c9948436048eac0225fe82f0df..df899dcbd5b0f12505e891abf4d73b39b6637f30 100644
(file)
--- a/
drivers/net/sky2.c
+++ b/
drivers/net/sky2.c
@@
-3442,6
+3442,7
@@
static int sky2_suspend(struct pci_dev *pdev, pm_message_t state)
}
}
+ sky2_write32(hw, B0_IMSK, 0);
pci_save_state(pdev);
sky2_set_power_state(hw, pstate);
return 0;
@@
-3460,6
+3461,8
@@
static int sky2_resume(struct pci_dev *pdev)
if (err)
goto out;
+ sky2_write32(hw, B0_IMSK, Y2_IS_BASE);
+
for (i = 0; i < hw->ports; i++) {
struct net_device *dev = hw->dev[i];
if (dev && netif_running(dev)) {