]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
[ALSA] hda-codec - Fix ALC882 capture source selection
authorTakashi Iwai <tiwai@suse.de>
Fri, 22 Feb 2008 17:45:30 +0000 (18:45 +0100)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 22 Feb 2008 22:20:09 +0000 (14:20 -0800)
The capture source selection for ADC list with two elements is buggy
becaues of a wrong capture mux list.  This patch fixes the starting
index based on spec->num_adc_nids.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
sound/pci/hda/patch_realtek.c

index 2a463c921ae33a3f8f8276420d4d126d8e496b7b..777f8c01ca7a6c804d0050d785aaa163f0f42780 100644 (file)
@@ -5227,10 +5227,14 @@ static int alc882_mux_enum_put(struct snd_kcontrol *kcontrol,
        const struct hda_input_mux *imux = spec->input_mux;
        unsigned int adc_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
        static hda_nid_t capture_mixers[3] = { 0x24, 0x23, 0x22 };
-       hda_nid_t nid = capture_mixers[adc_idx];
+       hda_nid_t nid;
        unsigned int *cur_val = &spec->cur_mux[adc_idx];
        unsigned int i, idx;
 
+       if (spec->num_adc_nids < 3)
+               nid = capture_mixers[adc_idx + 1];
+       else
+               nid = capture_mixers[adc_idx];
        idx = ucontrol->value.enumerated.item[0];
        if (idx >= imux->num_items)
                idx = imux->num_items - 1;