Commit d5c5d8fe authored by Takashi Iwai's avatar Takashi Iwai Committed by Linus Torvalds
Browse files

[PATCH] ALSA: Fix Oops of suspend/resume with generic drivers 



The patch fixes Oops from sound drivers using generic platform device
but have no suspend/resume callbacks.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 10ded949

sound/core/init.c

+4 −2
Original line number Diff line number Diff line
@@ -828,6 +828,7 @@ static int snd_generic_suspend(struct device *dev, pm_message_t state, u32 level 
	card = get_snd_generic_card(dev);

	if (card->power_state == SNDRV_CTL_POWER_D3hot)

		return 0;

	if (card->pm_suspend)

		card->pm_suspend(card, PMSG_SUSPEND);

	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);

	return 0;
@@ -843,6 +844,7 @@ static int snd_generic_resume(struct device *dev, u32 level) 
	card = get_snd_generic_card(dev);

	if (card->power_state == SNDRV_CTL_POWER_D0)

		return 0;

	if (card->pm_suspend)

		card->pm_resume(card);

	snd_power_change_state(card, SNDRV_CTL_POWER_D0);

	return 0;