From: Takashi Iwai Date: Mon, 23 May 2011 18:27:02 +0000 (+0200) Subject: ALSA: hda - Fix initial capture-source with auto-mic for Cxt auto-parser X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=313d2c065253a7549f5e7f43409f1da455329acd;p=linux-beck.git ALSA: hda - Fix initial capture-source with auto-mic for Cxt auto-parser Fix the initialization of capture-source route when auto-mic is enabled for Conexant auto-parser. Signed-off-by: Takashi Iwai --- diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index cd1a93ae2170..e8dc736b2fc4 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -3697,13 +3697,14 @@ static int cx_auto_mux_enum_update(struct hda_codec *codec, { struct conexant_spec *spec = codec->spec; hda_nid_t adc; + int changed = 1; if (!imux->num_items) return 0; if (idx >= imux->num_items) idx = imux->num_items - 1; if (spec->cur_mux[0] == idx) - return 0; + changed = 0; adc = spec->imux_info[idx].adc; select_input_connection(codec, spec->imux_info[idx].adc, spec->imux_info[idx].pin); @@ -3716,7 +3717,7 @@ static int cx_auto_mux_enum_update(struct hda_codec *codec, spec->cur_adc_format); } spec->cur_mux[0] = idx; - return 1; + return changed; } static int cx_auto_mux_enum_put(struct snd_kcontrol *kcontrol,