---

yaml --- r: 371693 b: refs/heads/master c: 3f550e3 h: refs/heads/master i: 371691: c09a88d v: v3
git-mirror · Mar 7, 2013 · 9ae5633 · 9ae5633
1 parent 94c632c
commit 9ae5633
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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);
 	}