Skip to contentSkip to conversation

Patch "ALSA: hda - Fix unconditional GPIO toggle via automute" has been added to the 3.14-stable tree

PATCH [email protected] 1 participant 1 message Apr 10, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

ALSA: hda - Fix unconditional GPIO toggle via automute

to the 3.14-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-unconditional-gpio-toggle-via-automute.patch
and it can be found in the queue-3.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 1f7c6658962fa1260c1658d681bd6bb0c746b99a Mon Sep 17 00:00:00 2001

From: Takashi Iwai <[email protected]>
Date: Tue, 15 Mar 2016 16:44:55 +0100
Subject: ALSA: hda - Fix unconditional GPIO toggle via automute

From: Takashi Iwai <[email protected]>

commit 1f7c6658962fa1260c1658d681bd6bb0c746b99a upstream.

Cirrus HD-audio driver may adjust GPIO pins for EAPD dynamically depending on the jack plug state. This works fine for the auto-mute
mode where the speaker gets muted upon the HP jack plug. OTOH, when
the auto-mute mode is off, this turns off the EAPD unexpectedly depending on the jack state, which results in the silent speaker output.

This patch fixes the silent speaker output issue by setting GPIO bits constantly when the auto-mute mode is off.

---
 sound/pci/hda/patch_cirrus.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
sound/pci/hda/patch_cirrus.c +6 -2
@@ -177,8 +177,12 @@ static void cs_automute(struct hda_codec
 	snd_hda_gen_update_outputs(codec);
 
 	if (spec->gpio_eapd_hp || spec->gpio_eapd_speaker) {
-		spec->gpio_data = spec->gen.hp_jack_present ?
-			spec->gpio_eapd_hp : spec->gpio_eapd_speaker;
+		if (spec->gen.automute_speaker)
+			spec->gpio_data = spec->gen.hp_jack_present ?
+				spec->gpio_eapd_hp : spec->gpio_eapd_speaker;
+		else
+			spec->gpio_data =
+				spec->gpio_eapd_hp | spec->gpio_eapd_speaker;
 		snd_hda_codec_write(codec, 0x01, 0,
 				    AC_VERB_SET_GPIO_DATA, spec->gpio_data);
 	}

Patches currently in stable-queue which might be from [email protected] are

queue-3.14/alsa-intel8x0-add-clock-quirk-entry-for-ad1981b-on-ibm-thinkpad-x41.patch queue-3.14/alsa-usb-audio-fix-null-dereference-in-create_fixed_stream_quirk.patch queue-3.14/alsa-usb-audio-minor-code-cleanup-in-create_fixed_stream_quirk.patch queue-3.14/alsa-usb-audio-fix-double-free-in-error-paths-after-snd_usb_add_audio_stream-call.patch queue-3.14/alsa-hda-fix-unconditional-gpio-toggle-via-automute.patch queue-3.14/alsa-usb-audio-add-sanity-checks-for-endpoint-accesses.patch