From c91d620f0541a7c8db1ee150550a9581370054d0 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 10 Jan 2013 16:10:06 +0100 Subject: [PATCH] --- yaml --- r: 353120 b: refs/heads/master c: a365fed9806e182cb4e1b7bb1855759489d95858 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/hda_generic.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 75a52882555d..ace038101587 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fd1082159d1445b0306a4696a2aade251ce2fcb2 +refs/heads/master: a365fed9806e182cb4e1b7bb1855759489d95858 diff --git a/trunk/sound/pci/hda/hda_generic.c b/trunk/sound/pci/hda/hda_generic.c index 2020faf9e412..fb4d84394b7b 100644 --- a/trunk/sound/pci/hda/hda_generic.c +++ b/trunk/sound/pci/hda/hda_generic.c @@ -1767,6 +1767,12 @@ static int set_multi_io(struct hda_codec *codec, int idx, bool output) snd_hda_activate_path(codec, path, false, true); set_pin_target(codec, nid, spec->multi_io[idx].ctl_in, true); } + + /* update jack retasking in case it modifies any of them */ + snd_hda_gen_hp_automute(codec, NULL); + snd_hda_gen_line_automute(codec, NULL); + snd_hda_gen_mic_autoswitch(codec, NULL); + return 0; }