diff options
| author | Pavel Machek | 2005-04-17 00:25:30 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2005-04-17 00:25:30 +0200 |
| commit | e2d53566a757c8d12246d8daf8c5a2f21a0c4293 (patch) | |
| tree | 647d7fa2a0e9230f1253a04efd07a3d01a7bf785 /sound | |
| parent | [PATCH] fix u32 vs. pm_message_t in drivers/mmc,mtd,scsi (diff) | |
| download | kernel-qcow2-linux-e2d53566a757c8d12246d8daf8c5a2f21a0c4293.tar.gz kernel-qcow2-linux-e2d53566a757c8d12246d8daf8c5a2f21a0c4293.tar.xz kernel-qcow2-linux-e2d53566a757c8d12246d8daf8c5a2f21a0c4293.zip | |
[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')
| -rw-r--r-- | sound/core/init.c | 4 | ||||
| -rw-r--r-- | sound/pci/atiixp_modem.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sound/core/init.c b/sound/core/init.c index 3f1fa8eabb72..d72f58f450ce 100644 --- a/sound/core/init.c +++ b/sound/core/init.c @@ -744,7 +744,7 @@ struct snd_generic_device { #define SND_GENERIC_NAME "snd_generic_pm" -static int snd_generic_suspend(struct device *dev, u32 state, u32 level); +static int snd_generic_suspend(struct device *dev, pm_message_t state, u32 level); static int snd_generic_resume(struct device *dev, u32 level); static struct device_driver snd_generic_driver = { @@ -800,7 +800,7 @@ static void snd_generic_device_unregister(struct snd_generic_device *dev) } /* suspend/resume callbacks for snd_generic platform device */ -static int snd_generic_suspend(struct device *dev, u32 state, u32 level) +static int snd_generic_suspend(struct device *dev, pm_message_t state, u32 level) { snd_card_t *card; 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) snd_atiixp_aclink_down(chip); snd_atiixp_chip_stop(chip); - pci_set_power_state(chip->pci, 3); + pci_set_power_state(chip->pci, PCI_D3hot); pci_disable_device(chip->pci); return 0; } @@ -1132,7 +1132,7 @@ static int snd_atiixp_resume(snd_card_t *card) int i; pci_enable_device(chip->pci); - pci_set_power_state(chip->pci, 0); + pci_set_power_state(chip->pci, PCI_D0); pci_set_master(chip->pci); snd_atiixp_aclink_reset(chip); |