diff options
author | Takashi Iwai <tiwai@suse.de> | 2005-11-17 11:15:58 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-01-03 06:28:42 -0500 |
commit | e4f163d96080dda40fd02df725f3672d035e4c5a (patch) | |
tree | c97fc3575683cdbd9ea1d25bb92e0519501d2642 /sound/pcmcia/pdaudiocf/pdaudiocf_core.c | |
parent | 7f52bdb61bdb945b29c2a3b3a6d0f8e6e80b8ec8 (diff) |
[ALSA] pdaudiocf - Fix PM support
Modules: PDAudioCF driver
Fix the PM support on pdaudiocf driver.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pcmcia/pdaudiocf/pdaudiocf_core.c')
-rw-r--r-- | sound/pcmcia/pdaudiocf/pdaudiocf_core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf_core.c b/sound/pcmcia/pdaudiocf/pdaudiocf_core.c index 4f898238e0aa..bd0d70ff3019 100644 --- a/sound/pcmcia/pdaudiocf/pdaudiocf_core.c +++ b/sound/pcmcia/pdaudiocf/pdaudiocf_core.c | |||
@@ -255,11 +255,11 @@ void snd_pdacf_powerdown(struct snd_pdacf *chip) | |||
255 | 255 | ||
256 | #ifdef CONFIG_PM | 256 | #ifdef CONFIG_PM |
257 | 257 | ||
258 | int snd_pdacf_suspend(struct snd_card *card, pm_message_t state) | 258 | int snd_pdacf_suspend(struct snd_pdacf *chip, pm_message_t state) |
259 | { | 259 | { |
260 | struct snd_pdacf *chip = card->pm_private_data; | ||
261 | u16 val; | 260 | u16 val; |
262 | 261 | ||
262 | snd_power_change_state(chip->card, SNDRV_CTL_POWER_D3hot); | ||
263 | snd_pcm_suspend_all(chip->pcm); | 263 | snd_pcm_suspend_all(chip->pcm); |
264 | /* disable interrupts, but use direct write to preserve old register value in chip->regmap */ | 264 | /* disable interrupts, but use direct write to preserve old register value in chip->regmap */ |
265 | val = inw(chip->port + PDAUDIOCF_REG_IER); | 265 | val = inw(chip->port + PDAUDIOCF_REG_IER); |
@@ -275,9 +275,8 @@ static inline int check_signal(struct snd_pdacf *chip) | |||
275 | return (chip->ak4117->rcs0 & AK4117_UNLCK) == 0; | 275 | return (chip->ak4117->rcs0 & AK4117_UNLCK) == 0; |
276 | } | 276 | } |
277 | 277 | ||
278 | int snd_pdacf_resume(struct snd_card *card) | 278 | int snd_pdacf_resume(struct snd_pdacf *chip) |
279 | { | 279 | { |
280 | struct snd_pdacf *chip = card->pm_private_data; | ||
281 | int timeout = 40; | 280 | int timeout = 40; |
282 | 281 | ||
283 | pdacf_reinit(chip, 1); | 282 | pdacf_reinit(chip, 1); |
@@ -286,6 +285,7 @@ int snd_pdacf_resume(struct snd_card *card) | |||
286 | (snd_ak4117_external_rate(chip->ak4117) <= 0 || !check_signal(chip))) | 285 | (snd_ak4117_external_rate(chip->ak4117) <= 0 || !check_signal(chip))) |
287 | mdelay(1); | 286 | mdelay(1); |
288 | chip->chip_status &= ~PDAUDIOCF_STAT_IS_SUSPENDED; | 287 | chip->chip_status &= ~PDAUDIOCF_STAT_IS_SUSPENDED; |
288 | snd_power_change_state(chip->card, SNDRV_CTL_POWER_D0); | ||
289 | return 0; | 289 | return 0; |
290 | } | 290 | } |
291 | #endif | 291 | #endif |