aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-11-20 06:15:07 -0500
committerTakashi Iwai <tiwai@suse.de>2013-11-20 10:39:14 -0500
commit0fc28fc030a85aa3d6d14e9e9fca0c8237c9ffb5 (patch)
treecdc1aa54ea11813b005be3be65a4a103b977558b
parent09d2014fb0c6bcd0bf60f46e890907facd25d22c (diff)
ALSA: hda - Fix unbalanced runtime PM notification at resume
When a codec is resumed, it keeps the power on while the resuming phase via hda_keep_power_on(), then turns down via snd_hda_power_down(). At that point, snd_hda_power_down() notifies the power down to the controller, and this may confuse the refcount if the codec was already powered up before the resume. In the end result, the controller goes to runtime suspend even before the codec is kicked off to the power save, and the communication stalls happens. The fix is to add the power-up notification together with hda_keep_power_on(), and clears the flag appropriately. Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/pci/hda/hda_codec.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index afb90f48867f..69178c4f4113 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -4000,6 +4000,10 @@ static void hda_call_codec_resume(struct hda_codec *codec)
4000 * in the resume / power-save sequence 4000 * in the resume / power-save sequence
4001 */ 4001 */
4002 hda_keep_power_on(codec); 4002 hda_keep_power_on(codec);
4003 if (codec->pm_down_notified) {
4004 codec->pm_down_notified = 0;
4005 hda_call_pm_notify(codec->bus, true);
4006 }
4003 hda_set_power_state(codec, AC_PWRST_D0); 4007 hda_set_power_state(codec, AC_PWRST_D0);
4004 restore_shutup_pins(codec); 4008 restore_shutup_pins(codec);
4005 hda_exec_init_verbs(codec); 4009 hda_exec_init_verbs(codec);