diff options
author | Pavel Machek <pavel@suse.cz> | 2005-04-16 18:25:30 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 18:25:30 -0400 |
commit | e2d53566a757c8d12246d8daf8c5a2f21a0c4293 (patch) | |
tree | 647d7fa2a0e9230f1253a04efd07a3d01a7bf785 /sound/pci/atiixp_modem.c | |
parent | e5378ca8c0ab684bd9339dc6827dd5a042f9e6fc (diff) |
[PATCH] fix pm_message_t vs. u32 in alsa
I thought I'm done with fixing u32 vs. pm_message_t ... unfortunately that
turned out not to be the case as Russel King pointed out. This fixes last few
bits in alsa.
Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound/pci/atiixp_modem.c')
-rw-r--r-- | sound/pci/atiixp_modem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/atiixp_modem.c b/sound/pci/atiixp_modem.c index 5d3e537339f9..fb7cecea846d 100644 --- a/sound/pci/atiixp_modem.c +++ b/sound/pci/atiixp_modem.c | |||
@@ -1121,7 +1121,7 @@ static int snd_atiixp_suspend(snd_card_t *card, pm_message_t state) | |||
1121 | snd_atiixp_aclink_down(chip); | 1121 | snd_atiixp_aclink_down(chip); |
1122 | snd_atiixp_chip_stop(chip); | 1122 | snd_atiixp_chip_stop(chip); |
1123 | 1123 | ||
1124 | pci_set_power_state(chip->pci, 3); | 1124 | pci_set_power_state(chip->pci, PCI_D3hot); |
1125 | pci_disable_device(chip->pci); | 1125 | pci_disable_device(chip->pci); |
1126 | return 0; | 1126 | return 0; |
1127 | } | 1127 | } |
@@ -1132,7 +1132,7 @@ static int snd_atiixp_resume(snd_card_t *card) | |||
1132 | int i; | 1132 | int i; |
1133 | 1133 | ||
1134 | pci_enable_device(chip->pci); | 1134 | pci_enable_device(chip->pci); |
1135 | pci_set_power_state(chip->pci, 0); | 1135 | pci_set_power_state(chip->pci, PCI_D0); |
1136 | pci_set_master(chip->pci); | 1136 | pci_set_master(chip->pci); |
1137 | 1137 | ||
1138 | snd_atiixp_aclink_reset(chip); | 1138 | snd_atiixp_aclink_reset(chip); |