ALSA: hda/conexant - Enable ADC-switching for auto-mic mode, too

tiwai · tiwai · commit 767553595817 · 2011-08-24T10:53:10.000+02:00
The ADC-switching can work also in the auto-mic mode, too.

Signed-off-by: Takashi Iwai &lt;tiwai@suse.de&gt;
diff --git a/sound/pci/hda/patch_conexant.c b/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;

Original file line number	Diff line number	Diff line change
`@@ -3866,7 +3866,7 @@ static void cx_auto_parse_input(struct hda_codec *codec)`
`3866`	`3866`	`}`
`3867`	`3867`	`if (imux->num_items >= 2 && cfg->num_inputs == imux->num_items)`
`3868`	`3868`	`cx_auto_check_auto_mic(codec);`
`3869`		`- if (imux->num_items > 1 && !spec->auto_mic) {`
	`3869`	`+ if (imux->num_items > 1) {`
`3870`	`3870`	`for (i = 1; i < imux->num_items; i++) {`
`3871`	`3871`	`if (spec->imux_info[i].adc != spec->imux_info[0].adc) {`
`3872`	`3872`	`spec->adc_switching = 1;`