tree ae0845892ef3e22f77ad0b9029d86a6f11eaca9b
parent 0bea42b5009d583b46f2032c226c6fd3fae0af88
author Pavel Machek <[EMAIL PROTECTED]> Tue Apr 12 08:25:59 2005
committer Linus Torvalds <[EMAIL PROTECTED]> Tue Apr 12 08:25:59 2005
[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
===================================================================
--- 99bfe1a70b64beda23eae38d69d2eec33810fdec/sound/core/init.c (mode:100644
sha1:0de0733057731bc68a8298051205e92c5743049f)
+++ ae0845892ef3e22f77ad0b9029d86a6f11eaca9b/sound/core/init.c (mode:100644
sha1:2d03c9c78d7b5c5fe5abde50345b6d613980a1d3)
@@ -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
===================================================================
--- 99bfe1a70b64beda23eae38d69d2eec33810fdec/sound/pci/atiixp_modem.c
(mode:100644 sha1:5dea9a1cceddae71679caa40b80f739a54596335)
+++ ae0845892ef3e22f77ad0b9029d86a6f11eaca9b/sound/pci/atiixp_modem.c
(mode:100644 sha1:c130c3e3af1036e84bcafe619712aef0a0e72749)
@@ -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
