This is a note to let you know that I've just added the patch titled
ALSA: hda - Fix unbalanced runtime PM notification at resume
to the 3.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
alsa-hda-fix-unbalanced-runtime-pm-notification-at-resume.patch
and it can be found in the queue-3.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 0fc28fc030a85aa3d6d14e9e9fca0c8237c9ffb5 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@xxxxxxx>
Date: Wed, 20 Nov 2013 12:15:07 +0100
Subject: ALSA: hda - Fix unbalanced runtime PM notification at resume
From: Takashi Iwai <tiwai@xxxxxxx>
commit 0fc28fc030a85aa3d6d14e9e9fca0c8237c9ffb5 upstream.
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.
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
sound/pci/hda/hda_codec.c | 4 ++++
1 file changed, 4 insertions(+)
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -3924,6 +3924,10 @@ static void hda_call_codec_resume(struct
* in the resume / power-save sequence
*/
hda_keep_power_on(codec);
+ if (codec->pm_down_notified) {
+ codec->pm_down_notified = 0;
+ hda_call_pm_notify(codec->bus, true);
+ }
hda_set_power_state(codec, AC_PWRST_D0);
restore_shutup_pins(codec);
hda_exec_init_verbs(codec);
Patches currently in stable-queue which might be from tiwai@xxxxxxx are
queue-3.10/alsa-hda-check-keep_eapd_on-before-inv_eapd.patch
queue-3.10/alsa-hda-don-t-clear-the-power-state-at-snd_hda_codec_reset.patch
queue-3.10/alsa-hda-add-support-for-cx20952.patch
queue-3.10/alsa-hda-enable-spdif-for-acer-travelmate-6293.patch
queue-3.10/alsa-hda-fix-the-headphone-jack-detection-on-sony-vaio-tx.patch
queue-3.10/alsa-hda-provide-missing-pin-configs-for-vaio-with-alc260.patch
queue-3.10/alsa-compress-fix-drain-calls-blocking-other-compress-functions.patch
queue-3.10/alsa-compress-fix-drain-calls-blocking-other-compress-functions-v6.patch
queue-3.10/alsa-hda-add-pincfg-fixup-for-asus-w5a.patch
queue-3.10/alsa-hda-add-support-of-alc255-codecs.patch
queue-3.10/alsa-6fire-fix-probe-of-multiple-cards.patch
queue-3.10/alsa-hda-make-sure-mute-leds-stay-on-during-runtime-suspend-realtek.patch
queue-3.10/alsa-msnd-avoid-duplicated-driver-name.patch
queue-3.10/alsa-hda-fix-line-out-automute-on-realtek-multifunction-jacks.patch
queue-3.10/alsa-hda-add-headset-quirk-for-dell-inspiron-3135.patch
queue-3.10/alsa-hda-don-t-turn-off-eapd-for-headphone-on-lenovo-n100.patch
queue-3.10/alsa-hda-fix-unbalanced-runtime-pm-notification-at-resume.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html