---

yaml --- r: 371697 b: refs/heads/master c: 93c9d8a h: refs/heads/master i: 371695: c56620e v: v3
git-mirror · Mar 11, 2013 · 5150f11 · 5150f11
1 parent 49658b7
commit 5150f11
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d5702162f85526319c848c667df49ee1754dccef
+refs/heads/master: 93c9d8ae0b25ab7845b26813da1a326d2b1fea43
diff --git a/trunk/sound/pci/hda/hda_generic.c b/trunk/sound/pci/hda/hda_generic.c
@@ -2967,7 +2967,8 @@ static int create_input_ctls(struct hda_codec *codec)
 		val = PIN_IN;
 		if (cfg->inputs[i].type == AUTO_PIN_MIC)
 			val |= snd_hda_get_default_vref(codec, pin);
-		set_pin_target(codec, pin, val, false);
+		if (pin != spec->hp_mic_pin)
+			set_pin_target(codec, pin, val, false);
 
 		if (mixer) {
 			if (is_reachable_path(codec, pin, mixer)) {