lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] pm: more u32 vs. pm_message_t fixes

Browse Source 
Few more u32 vs. pm_message_t fixes.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Pavel Machek
2005-07-07 17:56:40 -07:00
committed by Linus Torvalds
parent e8af300c3b
commit 2a569579be
7 changed files with 14 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/typhoon.c
View File

@@ -1906,9 +1906,9 @@ typhoon_sleep(struct typhoon *tp, pci_power_t state, u16 events)
*/
netif_carrier_off(tp->dev);
pci_enable_wake(tp->pdev, pci_choose_state(pdev, state), 1);
pci_enable_wake(tp->pdev, state, 1);
pci_disable_device(pdev);
return pci_set_power_state(pdev, pci_choose_state(pdev, state));
return pci_set_power_state(pdev, state);
}
static int
@@ -2274,7 +2274,7 @@ typhoon_suspend(struct pci_dev *pdev, pm_message_t state)
goto need_resume;
}
if(typhoon_sleep(tp, state, tp->wol_events) < 0) {
if(typhoon_sleep(tp, pci_choose_state(pdev, state), tp->wol_events) < 0) {
printk(KERN_ERR "%s: unable to put card to sleep\n", dev->name);
goto need_resume;
}