This is a note to let you know that I've just added the patch titled
ALSA: hda - Fix EAPD vmaster hook for AD1884 & co
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-eapd-vmaster-hook-for-ad1884-co.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 8f0b3b7e222383a21f7d58bd97d5552b3a5dbced Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@xxxxxxx>
Date: Thu, 4 Jul 2013 12:54:22 +0200
Subject: ALSA: hda - Fix EAPD vmaster hook for AD1884 & co
From: Takashi Iwai <tiwai@xxxxxxx>
commit 8f0b3b7e222383a21f7d58bd97d5552b3a5dbced upstream.
ad1884_fixup_hp_eapd() tries to set the NID for controlling the
speaker EAPD from the pin configuration. But the current code can't
work expectedly since it sets spec->eapd_nid before calling the
generic parser where the autocfg pins are set up.
This patch changes the function to set spec->eapd_nid after the
generic parser call while it sets vmaster hook unconditionally. The
spec->eapd_nid check is moved in the hook function itself instead.
Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
sound/pci/hda/patch_analog.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
--- a/sound/pci/hda/patch_analog.c
+++ b/sound/pci/hda/patch_analog.c
@@ -2112,6 +2112,9 @@ static void ad_vmaster_eapd_hook(void *p
{
struct hda_codec *codec = private_data;
struct ad198x_spec *spec = codec->spec;
+
+ if (!spec->eapd_nid)
+ return;
snd_hda_codec_update_cache(codec, spec->eapd_nid, 0,
AC_VERB_SET_EAPD_BTLENABLE,
enabled ? 0x02 : 0x00);
@@ -3601,13 +3604,16 @@ static void ad1884_fixup_hp_eapd(struct
{
struct ad198x_spec *spec = codec->spec;
- if (action == HDA_FIXUP_ACT_PRE_PROBE) {
+ switch (action) {
+ case HDA_FIXUP_ACT_PRE_PROBE:
+ spec->gen.vmaster_mute.hook = ad_vmaster_eapd_hook;
+ break;
+ case HDA_FIXUP_ACT_PROBE:
if (spec->gen.autocfg.line_out_type == AUTO_PIN_SPEAKER_OUT)
spec->eapd_nid = spec->gen.autocfg.line_out_pins[0];
else
spec->eapd_nid = spec->gen.autocfg.speaker_pins[0];
- if (spec->eapd_nid)
- spec->gen.vmaster_mute.hook = ad_vmaster_eapd_hook;
+ break;
}
}
Patches currently in stable-queue which might be from tiwai@xxxxxxx are
queue-3.10/alsa-hda-fix-missing-mic-boost-controls-for-via-codecs.patch
queue-3.10/alsa-hda-fix-return-value-of-snd_hda_check_power_state.patch
queue-3.10/asoc-atmel-fix-unlocked-snd_pcm_stop-call.patch
queue-3.10/alsa-usx2y-fix-unlocked-snd_pcm_stop-call.patch
queue-3.10/asoc-s6000-fix-unlocked-snd_pcm_stop-call.patch
queue-3.10/alsa-hda-add-new-gpu-codec-id-to-snd-hda.patch
queue-3.10/alsa-ua101-fix-unlocked-snd_pcm_stop-call.patch
queue-3.10/alsa-6fire-fix-unlocked-snd_pcm_stop-call.patch
queue-3.10/alsa-hda-fix-eapd-vmaster-hook-for-ad1884-co.patch
queue-3.10/alsa-hda-cache-the-mux-selection-for-generic-hdmi.patch
queue-3.10/alsa-seq-oss-initialize-midi-clients-asynchronously.patch
queue-3.10/alsa-atiixp-fix-unlocked-snd_pcm_stop-call.patch
queue-3.10/alsa-asihpi-fix-unlocked-snd_pcm_stop-call.patch
queue-3.10/alsa-pxa2xx-fix-unlocked-snd_pcm_stop-call.patch
queue-3.10/alsa-hda-fix-the-max-length-of-control-name-in-generic-parser.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