Commit 95e99fda authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela

[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: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent 51882453
...@@ -1662,6 +1662,7 @@ static void hda_call_codec_suspend(struct hda_codec *codec) ...@@ -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) ...@@ -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) ...@@ -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 */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment