| From 094a42452abd5564429045e210281c6d22e67fca Mon Sep 17 00:00:00 2001 |
| From: Vitaliy Kulikov <Vitaliy.Kulikov@idt.com> |
| Date: Wed, 9 Mar 2011 19:47:43 -0600 |
| Subject: ALSA: hda - fix digital mic selection in mixer on 92HD8X codecs |
| |
| From: Vitaliy Kulikov <Vitaliy.Kulikov@idt.com> |
| |
| commit 094a42452abd5564429045e210281c6d22e67fca upstream. |
| |
| When the mux for digital mic is different from the mux for other mics, |
| the current auto-parser doesn't handle them in a right way but provides |
| only one mic. This patch fixes the issue. |
| |
| Signed-off-by: Vitaliy Kulikov <Vitaliy.Kulikov@idt.com> |
| Signed-off-by: Takashi Iwai <tiwai@suse.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| sound/pci/hda/patch_sigmatel.c | 11 ++++++++--- |
| 1 file changed, 8 insertions(+), 3 deletions(-) |
| |
| --- a/sound/pci/hda/patch_sigmatel.c |
| +++ b/sound/pci/hda/patch_sigmatel.c |
| @@ -729,7 +729,7 @@ static int stac92xx_mux_enum_put(struct |
| struct sigmatel_spec *spec = codec->spec; |
| unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id); |
| const struct hda_input_mux *imux = spec->input_mux; |
| - unsigned int idx, prev_idx; |
| + unsigned int idx, prev_idx, didx; |
| |
| idx = ucontrol->value.enumerated.item[0]; |
| if (idx >= imux->num_items) |
| @@ -741,7 +741,8 @@ static int stac92xx_mux_enum_put(struct |
| snd_hda_codec_write_cache(codec, spec->mux_nids[adc_idx], 0, |
| AC_VERB_SET_CONNECT_SEL, |
| imux->items[idx].index); |
| - if (prev_idx >= spec->num_analog_muxes) { |
| + if (prev_idx >= spec->num_analog_muxes && |
| + spec->mux_nids[adc_idx] != spec->dmux_nids[adc_idx]) { |
| imux = spec->dinput_mux; |
| /* 0 = analog */ |
| snd_hda_codec_write_cache(codec, |
| @@ -751,9 +752,13 @@ static int stac92xx_mux_enum_put(struct |
| } |
| } else { |
| imux = spec->dinput_mux; |
| + /* first dimux item is hardcoded to select analog imux, |
| + * so lets skip it |
| + */ |
| + didx = idx - spec->num_analog_muxes + 1; |
| snd_hda_codec_write_cache(codec, spec->dmux_nids[adc_idx], 0, |
| AC_VERB_SET_CONNECT_SEL, |
| - imux->items[idx - 1].index); |
| + imux->items[didx].index); |
| } |
| spec->cur_mux[adc_idx] = idx; |
| return 1; |
