Browse Source

Merge branch 'fix/hda' into topic/hda

Takashi Iwai 14 years ago
parent
commit
a301fed4b9
1 changed files with 1 additions and 1 deletions
  1. 1 1
      sound/pci/hda/patch_conexant.c

+ 1 - 1
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)
 	if (imux->num_items >= 2 && cfg->num_inputs == imux->num_items)
 		cx_auto_check_auto_mic(codec);
 		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++) {
 		for (i = 1; i < imux->num_items; i++) {
 			if (spec->imux_info[i].adc != spec->imux_info[0].adc) {
 			if (spec->imux_info[i].adc != spec->imux_info[0].adc) {
 				spec->adc_switching = 1;
 				spec->adc_switching = 1;