This is a note to let you know that I've just added the patch titled
ALSA: hda - Fix silent speaker output due to mute LED fixup
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-silent-speaker-output-due-to-mute-led-fixup.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 415d555e6b398b00fc1733f0113065a54df9106a Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu, 3 Apr 2014 11:51:21 +0200
Subject: ALSA: hda - Fix silent speaker output due to mute LED fixup
From: Takashi Iwai <tiwai@xxxxxxx>
commit 415d555e6b398b00fc1733f0113065a54df9106a upstream.
The recent fixups for HP laptops to support the mute LED made the
speaker output silent on some machines. It turned out that they use
the NID 0x18 for the speaker while it's also used for controlling the
LED via VREF bits although the current driver code blindly assumes
that such a node is a mic pin (where 0x18 is usually so).
This patch fixes the problem by only changing the VREF bits and
keeping the other pin ctl bits.
Reported-and-tested-by: Hui Wang <hui.wang@xxxxxxxxxxxxx>
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
sound/pci/hda/patch_realtek.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -2859,8 +2859,9 @@ static void alc269_fixup_mic_mute_hook(v
if (spec->mute_led_polarity)
enabled = !enabled;
- pinval = AC_PINCTL_IN_EN |
- (enabled ? AC_PINCTL_VREF_HIZ : AC_PINCTL_VREF_80);
+ pinval = snd_hda_codec_get_pin_target(codec, spec->mute_led_nid);
+ pinval &= ~AC_PINCTL_VREFEN;
+ pinval |= enabled ? AC_PINCTL_VREF_HIZ : AC_PINCTL_VREF_80;
if (spec->mute_led_nid)
snd_hda_set_pin_ctl_cache(codec, spec->mute_led_nid, pinval);
}
Patches currently in stable-queue which might be from tiwai@xxxxxxx are
queue-3.10/asoc-cs42l52-fix-mask-bits-for-soc_value_enum_single.patch
queue-3.10/alsa-ice1712-fix-boundary-checks-in-pcm-pointer-ops.patch
queue-3.10/alsa-hda-enable-beep-for-asus-1015e.patch
queue-3.10/alsa-hda-fix-silent-speaker-output-due-to-mute-led-fixup.patch
queue-3.10/asoc-cs42l73-fix-mask-bits-for-soc_value_enum_single.patch
queue-3.10/alsa-hda-realtek-add-support-of-alc288-codec.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