---

yaml --- r: 270361 b: refs/heads/master c: a301fed h: refs/heads/master i: 270359: 546f649 v: v3
git-mirror · Aug 24, 2011 · 453229b · 453229b
1 parent 07aacc9
commit 453229b
Show file tree

Hide file tree

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