diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-05-23 20:27:02 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-05-23 20:27:02 +0200 |
| commit | 313d2c065253a7549f5e7f43409f1da455329acd (patch) | |
| tree | f2b5dfaee9efa19cbc3140f4153d337fbde8cd3b /sound | |
| parent | 506a4196d44218eca20db529c84410dc1095e457 (diff) | |
| download | linux-stable-313d2c065253a7549f5e7f43409f1da455329acd.tar.gz linux-stable-313d2c065253a7549f5e7f43409f1da455329acd.tar.bz2 linux-stable-313d2c065253a7549f5e7f43409f1da455329acd.zip | |
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 <tiwai@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/patch_conexant.c | 5 |
1 files changed, 3 insertions, 2 deletions
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, |