diff options
| author | Stephen Hemminger <shemminger@linux-foundation.org> | 2007-04-08 01:02:27 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-04-11 17:54:43 +0200 |
| commit | 1ad5b4a5c224c5f98f9745adbcf99899624c8138 (patch) | |
| tree | c9a0f9721d6293384f2b4a5a7be484052bbd6e65 /drivers/net | |
| parent | sky2: turn carrier off when down (diff) | |
| download | linux-1ad5b4a5c224c5f98f9745adbcf99899624c8138.tar.xz linux-1ad5b4a5c224c5f98f9745adbcf99899624c8138.zip | |
sky2: turn on clocks when doing resume
Some of these chips are disabled until clock is enabled.
This fixes:
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=404107
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/sky2.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index 45c4525a46e4..b636b8a55ffb 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c @@ -3770,6 +3770,11 @@ static int sky2_resume(struct pci_dev *pdev) goto out; pci_enable_wake(pdev, PCI_D0, 0); + + /* Re-enable all clocks */ + if (hw->chip_id == CHIP_ID_YUKON_EX || hw->chip_id == CHIP_ID_YUKON_EC_U) + sky2_pci_write32(hw, PCI_DEV_REG3, 0); + sky2_reset(hw); sky2_write32(hw, B0_IMSK, Y2_IS_BASE); |