diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/skge.c | 4 | ||||
-rw-r--r-- | drivers/net/typhoon.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/skge.c b/drivers/net/skge.c index 3dbb1cb09ed8..5cacc7ad9e79 100644 --- a/drivers/net/skge.c +++ b/drivers/net/skge.c | |||
@@ -3259,7 +3259,7 @@ static void __devexit skge_remove(struct pci_dev *pdev) | |||
3259 | } | 3259 | } |
3260 | 3260 | ||
3261 | #ifdef CONFIG_PM | 3261 | #ifdef CONFIG_PM |
3262 | static int skge_suspend(struct pci_dev *pdev, u32 state) | 3262 | static int skge_suspend(struct pci_dev *pdev, pm_message_t state) |
3263 | { | 3263 | { |
3264 | struct skge_hw *hw = pci_get_drvdata(pdev); | 3264 | struct skge_hw *hw = pci_get_drvdata(pdev); |
3265 | int i, wol = 0; | 3265 | int i, wol = 0; |
@@ -3279,7 +3279,7 @@ static int skge_suspend(struct pci_dev *pdev, u32 state) | |||
3279 | } | 3279 | } |
3280 | 3280 | ||
3281 | pci_save_state(pdev); | 3281 | pci_save_state(pdev); |
3282 | pci_enable_wake(pdev, state, wol); | 3282 | pci_enable_wake(pdev, pci_choose_state(pdev, state), wol); |
3283 | pci_disable_device(pdev); | 3283 | pci_disable_device(pdev); |
3284 | pci_set_power_state(pdev, pci_choose_state(pdev, state)); | 3284 | pci_set_power_state(pdev, pci_choose_state(pdev, state)); |
3285 | 3285 | ||
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c index 0b5ca2537963..ecfa6f8805ce 100644 --- a/drivers/net/typhoon.c +++ b/drivers/net/typhoon.c | |||
@@ -1906,9 +1906,9 @@ typhoon_sleep(struct typhoon *tp, pci_power_t state, u16 events) | |||
1906 | */ | 1906 | */ |
1907 | netif_carrier_off(tp->dev); | 1907 | netif_carrier_off(tp->dev); |
1908 | 1908 | ||
1909 | pci_enable_wake(tp->pdev, pci_choose_state(pdev, state), 1); | 1909 | pci_enable_wake(tp->pdev, state, 1); |
1910 | pci_disable_device(pdev); | 1910 | pci_disable_device(pdev); |
1911 | return pci_set_power_state(pdev, pci_choose_state(pdev, state)); | 1911 | return pci_set_power_state(pdev, state); |
1912 | } | 1912 | } |
1913 | 1913 | ||
1914 | static int | 1914 | static int |
@@ -2274,7 +2274,7 @@ typhoon_suspend(struct pci_dev *pdev, pm_message_t state) | |||
2274 | goto need_resume; | 2274 | goto need_resume; |
2275 | } | 2275 | } |
2276 | 2276 | ||
2277 | if(typhoon_sleep(tp, state, tp->wol_events) < 0) { | 2277 | if(typhoon_sleep(tp, pci_choose_state(pdev, state), tp->wol_events) < 0) { |
2278 | printk(KERN_ERR "%s: unable to put card to sleep\n", dev->name); | 2278 | printk(KERN_ERR "%s: unable to put card to sleep\n", dev->name); |
2279 | goto need_resume; | 2279 | goto need_resume; |
2280 | } | 2280 | } |