summaryrefslogtreecommitdiffstats
path: root/drivers/net/tulip
diff options
context:
space:
mode:
authorMaxim Levitsky <maximlevitsky@gmail.com>2007-11-23 00:30:15 +0100
committerJeff Garzik <jeff@garzik.org>2007-11-24 04:09:01 +0100
commit65809b5125d61e0c8a7f6c0a5431450eaf853820 (patch)
tree5ffc0a7e86e0469823d4c051f351f92e6540efcd /drivers/net/tulip
parentsmc911x: Fix multicast handling (diff)
downloadlinux-65809b5125d61e0c8a7f6c0a5431450eaf853820.tar.xz
linux-65809b5125d61e0c8a7f6c0a5431450eaf853820.zip
NET: dmfe: don't access configuration space in D3 state
Accidently I reversed the order of pci_save_state and pci_set_power_state in .suspend()/.resume() callbacks Signed-off-by: Maxim Levitsky <maximlevitsky@gmail.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/tulip')
-rw-r--r--drivers/net/tulip/dmfe.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c
index ca90566d5bcd..208dae745257 100644
--- a/drivers/net/tulip/dmfe.c
+++ b/drivers/net/tulip/dmfe.c
@@ -2118,8 +2118,8 @@ static int dmfe_suspend(struct pci_dev *pci_dev, pm_message_t state)
pci_enable_wake(pci_dev, PCI_D3cold, 1);
/* Power down device*/
- pci_set_power_state(pci_dev, pci_choose_state (pci_dev,state));
pci_save_state(pci_dev);
+ pci_set_power_state(pci_dev, pci_choose_state (pci_dev,state));
return 0;
}
@@ -2129,8 +2129,8 @@ static int dmfe_resume(struct pci_dev *pci_dev)
struct net_device *dev = pci_get_drvdata(pci_dev);
u32 tmp;
- pci_restore_state(pci_dev);
pci_set_power_state(pci_dev, PCI_D0);
+ pci_restore_state(pci_dev);
/* Re-initilize DM910X board */
dmfe_init_dm910x(dev);