mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 01:10:04 +00:00
[ALSA] cs4231 - Fix PM support
Modules: CS4231 driver Fix PM support. Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
686688458e
commit
7bb35e20e8
1 changed files with 1 additions and 19 deletions
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue