From: David Henningsson Date: Tue, 12 Nov 2013 10:10:57 +0000 (+0100) Subject: ALSA: hda - Fix Line Out automute on Realtek multifunction jacks X-Git-Tag: firefly_0821_release~6453^2~274 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=c6ebcc4a440d9d8243ce33ed6c95235125fe1a80;hp=705f5ab4855df0dee9abd526b170cb43632add72;p=firefly-linux-kernel-4.4.55.git ALSA: hda - Fix Line Out automute on Realtek multifunction jacks commit 5959a6bc1124211a359525d209005abc07b0197b upstream. 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. BugLink: https://bugs.launchpad.net/bugs/1250377 Tested-by: Cyrus Lien Signed-off-by: David Henningsson Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 48aa3cd7d0b2..3a9bd60aa3e4 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -3093,8 +3093,10 @@ static void alc_update_headset_mode(struct hda_codec *codec) else new_headset_mode = ALC_HEADSET_MODE_HEADPHONE; - if (new_headset_mode == spec->current_headset_mode) + if (new_headset_mode == spec->current_headset_mode) { + snd_hda_gen_update_outputs(codec); return; + } switch (new_headset_mode) { case ALC_HEADSET_MODE_UNPLUGGED: