This is a note to let you know that I've just added the patch titled
ALSA: hda - Check keep_eapd_on before inv_eapd
to the 3.12-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-check-keep_eapd_on-before-inv_eapd.patch
and it can be found in the queue-3.12 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 468ac413045af1e0e4d1272291bed6878f248a69 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <[email protected]>
Date: Tue, 12 Nov 2013 11:36:00 +0100
Subject: ALSA: hda - Check keep_eapd_on before inv_eapd
From: Takashi Iwai <[email protected]>
commit 468ac413045af1e0e4d1272291bed6878f248a69 upstream.
We don't change the EAPD bit in set_pin_eapd() if keep_eapd_on flag is
set by the codec driver and enable is false. But, we also apply the
flipping of enable value according to inv_eapd flag in the same
function, and this confused the former check, handled as if it's
turned ON. The inverted EAPD check must be applied after keep_eapd_on
check, instead.
Signed-off-by: Takashi Iwai <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
sound/pci/hda/hda_generic.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/sound/pci/hda/hda_generic.c
+++ b/sound/pci/hda/hda_generic.c
@@ -796,10 +796,10 @@ static void set_pin_eapd(struct hda_code
if (spec->own_eapd_ctl ||
!(snd_hda_query_pin_caps(codec, pin) & AC_PINCAP_EAPD))
return;
- if (codec->inv_eapd)
- enable = !enable;
if (spec->keep_eapd_on && !enable)
return;
+ if (codec->inv_eapd)
+ enable = !enable;
snd_hda_codec_update_cache(codec, pin, 0,
AC_VERB_SET_EAPD_BTLENABLE,
enable ? 0x02 : 0x00);
Patches currently in stable-queue which might be from [email protected] are
queue-3.12/alsa-hda-check-keep_eapd_on-before-inv_eapd.patch
queue-3.12/alsa-hda-don-t-clear-the-power-state-at-snd_hda_codec_reset.patch
queue-3.12/alsa-hda-add-support-for-cx20952.patch
queue-3.12/alsa-hda-enable-spdif-for-acer-travelmate-6293.patch
queue-3.12/alsa-hda-fix-the-headphone-jack-detection-on-sony-vaio-tx.patch
queue-3.12/alsa-hda-provide-missing-pin-configs-for-vaio-with-alc260.patch
queue-3.12/alsa-compress-fix-drain-calls-blocking-other-compress-functions.patch
queue-3.12/alsa-hda-introduce-the-bitmask-for-excluding-output-volume.patch
queue-3.12/alsa-hda-apply-gpio-setup-for-macbooks-with-cs4208.patch
queue-3.12/thinkpad_acpi-fix-build-error-when-config_snd_max_cards-32.patch
queue-3.12/alsa-hda-force-buffer-alignment-for-haswell-hdmi-controllers.patch
queue-3.12/alsa-hda-apply-macbook-fixups-for-cs4208-correctly.patch
queue-3.12/alsa-compress-fix-drain-calls-blocking-other-compress-functions-v6.patch
queue-3.12/alsa-hda-add-pincfg-fixup-for-asus-w5a.patch
queue-3.12/alsa-hda-add-support-of-alc255-codecs.patch
queue-3.12/alsa-6fire-fix-probe-of-multiple-cards.patch
queue-3.12/alsa-hda-make-sure-mute-leds-stay-on-during-runtime-suspend-realtek.patch
queue-3.12/alsa-msnd-avoid-duplicated-driver-name.patch
queue-3.12/alsa-hda-fix-line-out-automute-on-realtek-multifunction-jacks.patch
queue-3.12/alsa-pcsp-fix-the-order-of-input-device-unregistration.patch
queue-3.12/alsa-hda-add-headset-quirk-for-dell-inspiron-3135.patch
queue-3.12/alsa-hda-don-t-turn-off-eapd-for-headphone-on-lenovo-n100.patch
queue-3.12/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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
