diff options
| author | Pavel Machek <pavel@suse.cz> | 2005-04-16 15:25:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 15:25:30 -0700 |
| commit | e2d53566a757c8d12246d8daf8c5a2f21a0c4293 (patch) | |
| tree | 647d7fa2a0e9230f1253a04efd07a3d01a7bf785 /sound/core | |
| parent | e5378ca8c0ab684bd9339dc6827dd5a042f9e6fc (diff) | |
| download | linux-3.10-e2d53566a757c8d12246d8daf8c5a2f21a0c4293.tar.gz linux-3.10-e2d53566a757c8d12246d8daf8c5a2f21a0c4293.tar.bz2 linux-3.10-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/core')
| -rw-r--r-- | sound/core/init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/core/init.c b/sound/core/init.c index 3f1fa8eabb7..d72f58f450c 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; |