From 5150f111103e9d5a6e80d076434485c73d275080 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 11 Mar 2013 09:48:43 +0100
Subject: [PATCH] --- yaml --- r: 371697 b: refs/heads/master c:
 93c9d8ae0b25ab7845b26813da1a326d2b1fea43 h: refs/heads/master i:   371695:
 c56620ec02373a1f820b79a728696269fcbb51aa v: v3

---
 [refs]                            | 2 +-
 trunk/sound/pci/hda/hda_generic.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3254bdb1fbb3..0e73530638dc 100644
--- 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
index fb232c118e91..aae6b1023d69 100644
--- 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)) {