lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ALSA: hda - Fix initial capture-source with auto-mic for Cxt auto-parser

Browse Source 
Fix the initialization of capture-source route when auto-mic is enabled
for Conexant auto-parser.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai
2011-05-23 20:27:02 +02:00
parent 506a4196d4
commit 313d2c0652
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sound/pci/hda/patch_conexant.c
View File

@@ -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,
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,