tree 647d7fa2a0e9230f1253a04efd07a3d01a7bf785
parent e5378ca8c0ab684bd9339dc6827dd5a042f9e6fc
author Pavel Machek <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:25:30 -0700
committer Linus Torvalds <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:25:30 -0700
[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 <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
core/init.c | 4 ++--
pci/atiixp_modem.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
Index: sound/core/init.c
===================================================================
--- 27dd779f05409b4f7ee91569ad009224729ccbb2/sound/core/init.c (mode:100644
sha1:3f1fa8eabb72860549a95a18ca046e1e2db48f71)
+++ 647d7fa2a0e9230f1253a04efd07a3d01a7bf785/sound/core/init.c (mode:100644
sha1:d72f58f450ce442dac0386be21a94c567ac2e293)
@@ -744,7 +744,7 @@
#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 @@
}
/* 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;
Index: sound/pci/atiixp_modem.c
===================================================================
--- 27dd779f05409b4f7ee91569ad009224729ccbb2/sound/pci/atiixp_modem.c
(mode:100644 sha1:5d3e537339f9cf84074a8a1f58d735827add6705)
+++ 647d7fa2a0e9230f1253a04efd07a3d01a7bf785/sound/pci/atiixp_modem.c
(mode:100644 sha1:fb7cecea846d069334d0b83e84401790ec6e78fc)
@@ -1121,7 +1121,7 @@
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 @@
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);
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
