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: <email address hidden> (3.10+) BugLink: https://bugs.launchpad.net/bugs/1250377 Tested-by: Cyrus Lien <email address hidden> Signed-off-by: David Henningsson <email address hidden> --- sound/pci/hda/patch_realtek.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 24d924d..04d1e6b 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) 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: -- 1.7.9.5
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: <email address hidden> (3.10+) /bugs.launchpad .net/bugs/ 1250377 pci/hda/ patch_realtek. c | 4 +++-
BugLink: https:/
Tested-by: Cyrus Lien <email address hidden>
Signed-off-by: David Henningsson <email address hidden>
---
sound/
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/sound/ pci/hda/ patch_realtek. c b/sound/ pci/hda/ patch_realtek. c pci/hda/ patch_realtek. c pci/hda/ patch_realtek. c headset_ mode(struct hda_codec *codec) MODE_HEADPHONE;
index 24d924d..04d1e6b 100644
--- a/sound/
+++ b/sound/
@@ -3344,8 +3344,10 @@ static void alc_update_
else
new_headset_mode = ALC_HEADSET_
- if (new_headset_mode == spec->current_ headset_ mode) headset_ mode) { gen_update_ outputs( codec);
+ if (new_headset_mode == spec->current_
+ snd_hda_
return;
+ }
switch (new_headset_mode) { MODE_UNPLUGGED:
case ALC_HEADSET_
--
1.7.9.5