aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
Diffstat (limited to 'sound')
-rw-r--r--sound/core/init.c4
-rw-r--r--sound/pci/atiixp_modem.c4
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 {
744 744
745#define SND_GENERIC_NAME "snd_generic_pm" 745#define SND_GENERIC_NAME "snd_generic_pm"
746 746
747static int snd_generic_suspend(struct device *dev, u32 state, u32 level); 747static int snd_generic_suspend(struct device *dev, pm_message_t state, u32 level);
748static int snd_generic_resume(struct device *dev, u32 level); 748static int snd_generic_resume(struct device *dev, u32 level);
749 749
750static struct device_driver snd_generic_driver = { 750static struct device_driver snd_generic_driver = {
@@ -800,7 +800,7 @@ static void snd_generic_device_unregister(struct snd_generic_device *dev)
800} 800}
801 801
802/* suspend/resume callbacks for snd_generic platform device */ 802/* suspend/resume callbacks for snd_generic platform device */
803static int snd_generic_suspend(struct device *dev, u32 state, u32 level) 803static int snd_generic_suspend(struct device *dev, pm_message_t state, u32 level)
804{ 804{
805 snd_card_t *card; 805 snd_card_t *card;
806 806
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);