From 453229b008aefcf696e5e7172e17b377e98c28af Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 24 Aug 2011 10:56:06 +0200
Subject: [PATCH] --- yaml --- r: 270361 b: refs/heads/master c:
 a301fed4b91dca95b64d9689480421aac9d79e3a h: refs/heads/master i:   270359:
 546f649fb9cfda584f1dec8de2042617212872ce v: v3

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

diff --git a/[refs] b/[refs]
index 5d935c81b7d6..a91fe4b4a22f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e8e1a9b05ccad82ac48cf63c8f96ff42f53f561
+refs/heads/master: a301fed4b91dca95b64d9689480421aac9d79e3a
diff --git a/trunk/sound/pci/hda/patch_conexant.c b/trunk/sound/pci/hda/patch_conexant.c
index 4c462c3d6462..5616444a8ed7 100644
--- a/trunk/sound/pci/hda/patch_conexant.c
+++ b/trunk/sound/pci/hda/patch_conexant.c
@@ -3866,7 +3866,7 @@ static void cx_auto_parse_input(struct hda_codec *codec)
 	}
 	if (imux->num_items >= 2 && cfg->num_inputs == imux->num_items)
 		cx_auto_check_auto_mic(codec);
-	if (imux->num_items > 1 && !spec->auto_mic) {
+	if (imux->num_items > 1) {
 		for (i = 1; i < imux->num_items; i++) {
 			if (spec->imux_info[i].adc != spec->imux_info[0].adc) {
 				spec->adc_switching = 1;