aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-06-12 12:53:27 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-12 12:53:27 -0700
commitd374c1c1281d6188a0d0676172b1c0e3de35c6e7 (patch)
treeaeae46b8a329faa0ad7e51b8a1900c1d937f9836
parent0e838b72d54ed189033939258a961f2a0cd59647 (diff)
[sky2] Fix sky2 network driver suspend/resume
This fixes two independent problems: it would not save the PCI state on suspend (and thus try to resume a nonexistent state on resume), and while shut off, if an interrupt happened on the same shared irq, the irq handler would react very badly to the interrupt status being an invalid all-ones state. Acked-by: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/net/sky2.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 959109609d8..6b87c7a5c90 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -2183,6 +2183,9 @@ static int sky2_poll(struct net_device *dev0, int *budget)
int work_done = 0;
u32 status = sky2_read32(hw, B0_Y2_SP_EISR);
+ if (!~status)
+ return 0;
+
if (status & Y2_IS_HW_ERR)
sky2_hw_intr(hw);
@@ -3438,6 +3441,7 @@ static int sky2_suspend(struct pci_dev *pdev, pm_message_t state)
}
}
+ pci_save_state(pdev);
return sky2_set_power_state(hw, pci_choose_state(pdev, state));
}