Commit 7bb35e20 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files

[ALSA] cs4231 - Fix PM support 



Modules: CS4231 driver

Fix PM support.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 68668845

sound/isa/cs423x/cs4231_lib.c

+1 −19
Original line number Original line Diff line number Diff line
@@ -1294,7 +1294,6 @@ static void snd_cs4231_suspend(struct snd_cs4231 *chip) 
	int reg;

	int reg;

	unsigned long flags;

	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);

	spin_lock_irqsave(&chip->reg_lock, flags);

	for (reg = 0; reg < 32; reg++)

	for (reg = 0; reg < 32; reg++)
@@ -1343,22 +1342,6 @@ static void snd_cs4231_resume(struct snd_cs4231 *chip) 
	snd_cs4231_busy_wait(chip);

	snd_cs4231_busy_wait(chip);

#endif

#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 */

#endif /* CONFIG_PM */





static int snd_cs4231_free(struct snd_cs4231 *chip)

static int snd_cs4231_free(struct snd_cs4231 *chip)
@@ -1516,7 +1499,6 @@ int snd_cs4231_create(struct snd_card *card, 
	/* Power Management */

	/* Power Management */

	chip->suspend = snd_cs4231_suspend;

	chip->suspend = snd_cs4231_suspend;

	chip->resume = snd_cs4231_resume;

	chip->resume = snd_cs4231_resume;

	snd_card_set_isa_pm_callback(card, snd_cs4231_pm_suspend, snd_cs4231_pm_resume, chip);

#endif

#endif





	*rchip = chip;

	*rchip = chip;