aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Henningsson <david.henningsson@canonical.com>2013-11-12 05:10:57 -0500
committerTakashi Iwai <tiwai@suse.de>2013-11-12 05:35:31 -0500
commit5959a6bc1124211a359525d209005abc07b0197b (patch)
tree94eb980c9864c890ab9af46f178247e27432191d
parent092f9cd16aac7d054af1755c945f37c1b33399e6 (diff)
ALSA: hda - Fix Line Out automute on Realtek multifunction jacks
In case there is both a multifunction headset jack and a Line Out jack, automuting was not working properly from the Line Out jack. This patch fixes that issue. Cc: stable@vger.kernel.org (3.10+) BugLink: https://bugs.launchpad.net/bugs/1250377 Tested-by: Cyrus Lien <cyrus.lien@canonical.com> Signed-off-by: David Henningsson <david.henningsson@canonical.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/pci/hda/patch_realtek.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 24d924d563aa..04d1e6be600e 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -3344,8 +3344,10 @@ static void alc_update_headset_mode(struct hda_codec *codec)
3344 else 3344 else
3345 new_headset_mode = ALC_HEADSET_MODE_HEADPHONE; 3345 new_headset_mode = ALC_HEADSET_MODE_HEADPHONE;
3346 3346
3347 if (new_headset_mode == spec->current_headset_mode) 3347 if (new_headset_mode == spec->current_headset_mode) {
3348 snd_hda_gen_update_outputs(codec);
3348 return; 3349 return;
3350 }
3349 3351
3350 switch (new_headset_mode) { 3352 switch (new_headset_mode) {
3351 case ALC_HEADSET_MODE_UNPLUGGED: 3353 case ALC_HEADSET_MODE_UNPLUGGED: