mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 19:00:25 +00:00
[ALSA] hda-intel - Fix resume with power save
The controller power wasn't turned on properly at resume due to the power-saving patch. Now fixed. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
This commit is contained in:
parent
51882453a7
commit
95e99fdadb
2 changed files with 2 additions and 2 deletions
|
@ -1662,6 +1662,7 @@ static void hda_call_codec_suspend(struct hda_codec *codec)
|
||||||
AC_PWRST_D3);
|
AC_PWRST_D3);
|
||||||
#ifdef CONFIG_SND_HDA_POWER_SAVE
|
#ifdef CONFIG_SND_HDA_POWER_SAVE
|
||||||
cancel_delayed_work(&codec->power_work);
|
cancel_delayed_work(&codec->power_work);
|
||||||
|
codec->power_on = 0;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2195,7 +2196,6 @@ static void hda_power_work(struct work_struct *work)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
hda_call_codec_suspend(codec);
|
hda_call_codec_suspend(codec);
|
||||||
codec->power_on = 0;
|
|
||||||
if (codec->bus->ops.pm_notify)
|
if (codec->bus->ops.pm_notify)
|
||||||
codec->bus->ops.pm_notify(codec);
|
codec->bus->ops.pm_notify(codec);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1500,7 +1500,7 @@ static int azx_acquire_irq(struct azx *chip, int do_disconnect)
|
||||||
|
|
||||||
static void azx_stop_chip(struct azx *chip)
|
static void azx_stop_chip(struct azx *chip)
|
||||||
{
|
{
|
||||||
if (chip->initialized)
|
if (!chip->initialized)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
/* disable interrupts */
|
/* disable interrupts */
|
||||||
|
|
Loading…
Reference in a new issue