diff options
| author | Takashi Iwai <tiwai@suse.de> | 2005-11-17 17:00:17 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2006-01-03 12:28:13 +0100 |
| commit | 7bb35e20e8a00cf9e3f4e9df0457eee9f312a637 (patch) | |
| tree | e5483c0460f2dd82318c3774d897b24ea3ea5d2b | |
| parent | [ALSA] ad1848 - Use platform_device, add PM (diff) | |
| download | linux-7bb35e20e8a00cf9e3f4e9df0457eee9f312a637.tar.xz linux-7bb35e20e8a00cf9e3f4e9df0457eee9f312a637.zip | |
[ALSA] cs4231 - Fix PM support
Modules: CS4231 driver
Fix PM support.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | sound/isa/cs423x/cs4231_lib.c | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/sound/isa/cs423x/cs4231_lib.c b/sound/isa/cs423x/cs4231_lib.c index ab9075f51237..ced22fd73497 100644 --- a/sound/isa/cs423x/cs4231_lib.c +++ b/sound/isa/cs423x/cs4231_lib.c @@ -1294,8 +1294,7 @@ static void snd_cs4231_suspend(struct snd_cs4231 *chip) int reg; unsigned long flags; - if (chip->pcm) - snd_pcm_suspend_all(chip->pcm); + snd_pcm_suspend_all(chip->pcm); spin_lock_irqsave(&chip->reg_lock, flags); for (reg = 0; reg < 32; reg++) chip->image[reg] = snd_cs4231_in(chip, reg); @@ -1343,22 +1342,6 @@ static void snd_cs4231_resume(struct snd_cs4231 *chip) snd_cs4231_busy_wait(chip); #endif } - -static int snd_cs4231_pm_suspend(struct snd_card *card, pm_message_t state) -{ - struct snd_cs4231 *chip = card->pm_private_data; - if (chip->suspend) - chip->suspend(chip); - return 0; -} - -static int snd_cs4231_pm_resume(struct snd_card *card) -{ - struct snd_cs4231 *chip = card->pm_private_data; - if (chip->resume) - chip->resume(chip); - return 0; -} #endif /* CONFIG_PM */ static int snd_cs4231_free(struct snd_cs4231 *chip) @@ -1516,7 +1499,6 @@ int snd_cs4231_create(struct snd_card *card, /* Power Management */ chip->suspend = snd_cs4231_suspend; chip->resume = snd_cs4231_resume; - snd_card_set_isa_pm_callback(card, snd_cs4231_pm_suspend, snd_cs4231_pm_resume, chip); #endif *rchip = chip; |