---

yaml --- r: 157842 b: refs/heads/master c: 2a22d3f h: refs/heads/master v: v3
git-mirror · Aug 10, 2009 · 3c765c9 · 3c765c9
1 parent 9ed4a24
commit 3c765c9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c8194922739138f046a4d0924519dd43b48e1f3
+refs/heads/master: 2a22d3f81283253ab9dae9244f3ca58a5ac66b36
diff --git a/trunk/sound/pci/hda/patch_realtek.c b/trunk/sound/pci/hda/patch_realtek.c
@@ -4683,8 +4683,10 @@ static void set_capture_mixer(struct alc_spec *spec)
 	};
 	if (spec->num_adc_nids > 0 && spec->num_adc_nids <= 3) {
 		int mux;
-		if (spec->input_mux && spec->input_mux->num_items > 1 &&
-		    !spec->auto_mic)
+		if (spec->auto_mic) {
+			mux = 0;
+			spec->num_adc_nids = 1; /* support only one ADC */
+		} else if (spec->input_mux && spec->input_mux->num_items > 1)
 			mux = 1;
 		else
 			mux = 0;