diff options
| author | Pavel Machek <pavel@ucw.cz> | 2005-09-03 18:56:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 03:06:15 -0400 |
| commit | 829ca9a30a2ddb727981d80fabdbff2ea86bc9ea (patch) | |
| tree | 044087fb18aa4b5f5bbd233f54f9eec3439ad6de /sound | |
| parent | 7e958883bced7e435f5a76349e15684858d3477c (diff) | |
[PATCH] swsusp: fix remaining u32 vs. pm_message_t confusion
Fix remaining bits of u32 vs. pm_message confusion. Should not break
anything.
Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/atiixp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/atiixp.c b/sound/pci/atiixp.c index 904d17394e1c..188df085b7ee 100644 --- a/sound/pci/atiixp.c +++ b/sound/pci/atiixp.c | |||
| @@ -1427,7 +1427,7 @@ static int snd_atiixp_suspend(snd_card_t *card, pm_message_t state) | |||
| 1427 | snd_atiixp_aclink_down(chip); | 1427 | snd_atiixp_aclink_down(chip); |
| 1428 | snd_atiixp_chip_stop(chip); | 1428 | snd_atiixp_chip_stop(chip); |
| 1429 | 1429 | ||
| 1430 | pci_set_power_state(chip->pci, 3); | 1430 | pci_set_power_state(chip->pci, PCI_D3hot); |
| 1431 | pci_disable_device(chip->pci); | 1431 | pci_disable_device(chip->pci); |
| 1432 | return 0; | 1432 | return 0; |
| 1433 | } | 1433 | } |
| @@ -1438,7 +1438,7 @@ static int snd_atiixp_resume(snd_card_t *card) | |||
| 1438 | int i; | 1438 | int i; |
| 1439 | 1439 | ||
| 1440 | pci_enable_device(chip->pci); | 1440 | pci_enable_device(chip->pci); |
| 1441 | pci_set_power_state(chip->pci, 0); | 1441 | pci_set_power_state(chip->pci, PCI_D0); |
| 1442 | pci_set_master(chip->pci); | 1442 | pci_set_master(chip->pci); |
| 1443 | 1443 | ||
| 1444 | snd_atiixp_aclink_reset(chip); | 1444 | snd_atiixp_aclink_reset(chip); |