diff options
| author | Greg Kroah-Hartman <greg@kroah.com> | 2004-12-21 23:55:57 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <greg@kroah.com> | 2004-12-21 23:55:57 -0800 |
| commit | e46a25e00c04c74b28455653b72fe2a994b25bdc (patch) | |
| tree | 9680004334b993a5fb5f9d40c65f9edc3f4727b4 /drivers/net/e100.c | |
| parent | cf5bd50cc6d3fc4c78d1ba6a800af699d084ae5d (diff) | |
| parent | c842b00abac4261b59f4c80094b264e40cc4f236 (diff) | |
Merge kroah.com:/home/greg/linux/BK/bleed-2.6
into kroah.com:/home/greg/linux/BK/pci-2.6
Diffstat (limited to 'drivers/net/e100.c')
| -rw-r--r-- | drivers/net/e100.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index c075355aabbb..19d03ccfd0de 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c @@ -2326,7 +2326,7 @@ static int e100_suspend(struct pci_dev *pdev, u32 state) pci_save_state(pdev); pci_enable_wake(pdev, state, nic->flags & (wol_magic | e100_asf(nic))); pci_disable_device(pdev); - pci_set_power_state(pdev, state); + pci_set_power_state(pdev, pci_choose_state(pdev, state)); return 0; } @@ -2336,7 +2336,7 @@ static int e100_resume(struct pci_dev *pdev) struct net_device *netdev = pci_get_drvdata(pdev); struct nic *nic = netdev_priv(netdev); - pci_set_power_state(pdev, 0); + pci_set_power_state(pdev, PCI_D0); pci_restore_state(pdev); e100_hw_init(nic); |