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/typhoon.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/typhoon.c')
| -rw-r--r-- | drivers/net/typhoon.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c index b7d706fb03b7..a369ca3306af 100644 --- a/drivers/net/typhoon.c +++ b/drivers/net/typhoon.c @@ -1890,7 +1890,7 @@ typhoon_sleep(struct typhoon *tp, int state, u16 events) pci_enable_wake(tp->pdev, state, 1); pci_disable_device(pdev); - return pci_set_power_state(pdev, state); + return pci_set_power_state(pdev, pci_choose_state(pdev, state)); } static int @@ -1899,7 +1899,7 @@ typhoon_wakeup(struct typhoon *tp, int wait_type) struct pci_dev *pdev = tp->pdev; void __iomem *ioaddr = tp->ioaddr; - pci_set_power_state(pdev, 0); + pci_set_power_state(pdev, PCI_D0); pci_restore_state(pdev); /* Post 2.x.x versions of the Sleep Image require a reset before @@ -2553,7 +2553,7 @@ typhoon_remove_one(struct pci_dev *pdev) struct typhoon *tp = netdev_priv(dev); unregister_netdev(dev); - pci_set_power_state(pdev, 0); + pci_set_power_state(pdev, PCI_D0); pci_restore_state(pdev); typhoon_reset(tp->ioaddr, NoWait); iounmap(tp->ioaddr); |