Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=cced83b62c61fb39b79e796981065dff474b62aa
Commit:     cced83b62c61fb39b79e796981065dff474b62aa
Parent:     614ca92b51b81eb42d6a3dcf125451632ddca0f5
Author:     Takashi Iwai <[EMAIL PROTECTED]>
AuthorDate: Fri Feb 22 18:45:30 2008 +0100
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Fri Feb 22 14:20:09 2008 -0800

    [ALSA] hda-codec - Fix ALC882 capture source selection
    
    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 <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 sound/pci/hda/patch_realtek.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 2a463c9..777f8c0 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -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;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to