From 9ae5633176ca9ed79c7d7ad252cee7739b68e835 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 7 Mar 2013 18:30:27 +0100 Subject: [PATCH] --- yaml --- r: 371693 b: refs/heads/master c: 3f550e323242bea82d07dfd06e6ce3f723eef7bd h: refs/heads/master i: 371691: c09a88de528cf6a5554edb85bffa2ea19653b7a8 v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/hda_generic.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 04f6e7e7dd7f..72b3530300ac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5ebd3bbdcc17c9523dbbbf9c756da1676ca7e973 +refs/heads/master: 3f550e323242bea82d07dfd06e6ce3f723eef7bd diff --git a/trunk/sound/pci/hda/hda_generic.c b/trunk/sound/pci/hda/hda_generic.c index dc849e489641..cb40a0b7ce3e 100644 --- a/trunk/sound/pci/hda/hda_generic.c +++ b/trunk/sound/pci/hda/hda_generic.c @@ -2650,8 +2650,8 @@ static int hp_mic_jack_mode_put(struct snd_kcontrol *kcontrol, if (in_jacks > 1) { unsigned int vref_caps = get_vref_caps(codec, nid); val = snd_hda_codec_get_pin_target(codec, nid); - val &= ~AC_PINCTL_VREFEN; - val |= get_vref_idx(vref_caps, idx); + val &= ~(AC_PINCTL_VREFEN | PIN_HP); + val |= get_vref_idx(vref_caps, idx) | PIN_IN; } else val = snd_hda_get_default_vref(codec, nid); }