lkml.org 
[lkml]   [2010]   [Mar]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[007/156] ALSA: hda - Fix input source elements of secondary ADCs on Realtek
    2.6.33-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Takashi Iwai <tiwai@suse.de>

    commit 5311114d4867113c00f78829d4ce14be458ec925 upstream.

    Since alc_auto_create_input_ctls() doesn't set the elements for the
    secondary ADCs, "Input Source" elemtns for these also get empty, resulting
    in buggy outputs of alsactl like:
    control.14 {
    comment.access 'read write'
    comment.type ENUMERATED
    comment.count 1
    iface MIXER
    name 'Input Source'
    index 1
    value 0
    }

    This patch fixes alc_mux_enum_*() (and others) to fall back to the
    first entry if the secondary input mux is empty.

    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    sound/pci/hda/patch_realtek.c | 6 ++++++
    1 file changed, 6 insertions(+)

    --- a/sound/pci/hda/patch_realtek.c
    +++ b/sound/pci/hda/patch_realtek.c
    @@ -407,6 +407,8 @@ static int alc_mux_enum_info(struct snd_
    unsigned int mux_idx = snd_ctl_get_ioffidx(kcontrol, &uinfo->id);
    if (mux_idx >= spec->num_mux_defs)
    mux_idx = 0;
    + if (!spec->input_mux[mux_idx].num_items && mux_idx > 0)
    + mux_idx = 0;
    return snd_hda_input_mux_info(&spec->input_mux[mux_idx], uinfo);
    }

    @@ -435,6 +437,8 @@ static int alc_mux_enum_put(struct snd_k

    mux_idx = adc_idx >= spec->num_mux_defs ? 0 : adc_idx;
    imux = &spec->input_mux[mux_idx];
    + if (!imux->num_items && mux_idx > 0)
    + imux = &spec->input_mux[0];

    type = get_wcaps_type(get_wcaps(codec, nid));
    if (type == AC_WID_AUD_MIX) {
    @@ -9941,6 +9945,8 @@ static void alc882_auto_init_input_src(s
    continue;
    mux_idx = c >= spec->num_mux_defs ? 0 : c;
    imux = &spec->input_mux[mux_idx];
    + if (!imux->num_items && mux_idx > 0)
    + imux = &spec->input_mux[0];
    for (idx = 0; idx < conns; idx++) {
    /* if the current connection is the selected one,
    * unmute it as default - otherwise mute it



    \
     
     \ /
      Last update: 2010-03-31 01:23    [W:4.699 / U:0.356 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site