diff options
| author | Ondrej Zary <linux@rainbow-software.org> | 2010-09-24 23:57:02 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-26 15:49:38 -0700 |
| commit | b0255a02351b00ca55f4eb2588d05a5db9dd1a58 (patch) | |
| tree | a0e12e378089350e8d75d77ca70809e7603525e8 /drivers/net/tulip | |
| parent | e0f9c4f332c99b213d4a0b7cd21dc0781ceb3d86 (diff) | |
| download | linux-stable-b0255a02351b00ca55f4eb2588d05a5db9dd1a58.tar.gz linux-stable-b0255a02351b00ca55f4eb2588d05a5db9dd1a58.tar.bz2 linux-stable-b0255a02351b00ca55f4eb2588d05a5db9dd1a58.zip | |
de2104x: fix power management
At least my 21041 cards come out of suspend with bus mastering disabled so
they did not work after resume(no data transferred).
After adding pci_set_master(), the driver oopsed immediately on resume -
because de_clean_rings() is called on suspend but de_init_rings() call
was missing in resume.
Also disable link (reset SIA) before sleep (de4x5 does this too).
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Acked-by: Jeff Garzik <jgarzik@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tulip')
| -rw-r--r-- | drivers/net/tulip/de2104x.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c index 9d6b7e9c7a6b..a0be7c28c587 100644 --- a/drivers/net/tulip/de2104x.c +++ b/drivers/net/tulip/de2104x.c @@ -1231,6 +1231,7 @@ static void de_adapter_sleep (struct de_private *de) if (de->de21040) return; + dw32(CSR13, 0); /* Reset phy */ pci_read_config_dword(de->pdev, PCIPM, &pmctl); pmctl |= PM_Sleep; pci_write_config_dword(de->pdev, PCIPM, pmctl); @@ -2166,6 +2167,8 @@ static int de_resume (struct pci_dev *pdev) dev_err(&dev->dev, "pci_enable_device failed in resume\n"); goto out; } + pci_set_master(pdev); + de_init_rings(de); de_init_hw(de); out_attach: netif_device_attach(dev); |