Commit 313d2c06 authored by Takashi Iwai's avatar Takashi Iwai

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: default avatarTakashi Iwai <tiwai@suse.de>
parent 506a4196
...@@ -3697,13 +3697,14 @@ static int cx_auto_mux_enum_update(struct hda_codec *codec, ...@@ -3697,13 +3697,14 @@ static int cx_auto_mux_enum_update(struct hda_codec *codec,
{ {
struct conexant_spec *spec = codec->spec; struct conexant_spec *spec = codec->spec;
hda_nid_t adc; hda_nid_t adc;
int changed = 1;
if (!imux->num_items) if (!imux->num_items)
return 0; return 0;
if (idx >= imux->num_items) if (idx >= imux->num_items)
idx = imux->num_items - 1; idx = imux->num_items - 1;
if (spec->cur_mux[0] == idx) if (spec->cur_mux[0] == idx)
return 0; changed = 0;
adc = spec->imux_info[idx].adc; adc = spec->imux_info[idx].adc;
select_input_connection(codec, spec->imux_info[idx].adc, select_input_connection(codec, spec->imux_info[idx].adc,
spec->imux_info[idx].pin); spec->imux_info[idx].pin);
...@@ -3716,7 +3717,7 @@ static int cx_auto_mux_enum_update(struct hda_codec *codec, ...@@ -3716,7 +3717,7 @@ static int cx_auto_mux_enum_update(struct hda_codec *codec,
spec->cur_adc_format); spec->cur_adc_format);
} }
spec->cur_mux[0] = idx; spec->cur_mux[0] = idx;
return 1; return changed;
} }
static int cx_auto_mux_enum_put(struct snd_kcontrol *kcontrol, static int cx_auto_mux_enum_put(struct snd_kcontrol *kcontrol,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment