lkml.org 
[lkml]   [2012]   [Jan]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[08/48] ALSA: HDA: Fix master control for Cirrus Logic 421X
    3.1-stable review patch.  If anyone has any objections, please let me know.

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

    From: David Henningsson <david.henningsson@canonical.com>

    commit 40d03e63e91af8ddccdfd5a536cc2a6e51433e1d upstream.

    The control name "HP/Speakers" is non-standard, and since there is
    only one DAC on this chip there is no need for a virtual master
    anyway.

    Signed-off-by: David Henningsson <david.henningsson@canonical.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    sound/pci/hda/patch_cirrus.c | 13 +------------
    1 file changed, 1 insertion(+), 12 deletions(-)

    --- a/sound/pci/hda/patch_cirrus.c
    +++ b/sound/pci/hda/patch_cirrus.c
    @@ -1756,30 +1756,19 @@ static int build_cs421x_output(struct hd
    struct auto_pin_cfg *cfg = &spec->autocfg;
    struct snd_kcontrol *kctl;
    int err;
    - char *name = "HP/Speakers";
    + char *name = "Master";

    fix_volume_caps(codec, dac);
    - if (!spec->vmaster_sw) {
    - err = add_vmaster(codec, dac);
    - if (err < 0)
    - return err;
    - }

    err = add_mute(codec, name, 0,
    HDA_COMPOSE_AMP_VAL(dac, 3, 0, HDA_OUTPUT), 0, &kctl);
    if (err < 0)
    return err;
    - err = snd_ctl_add_slave(spec->vmaster_sw, kctl);
    - if (err < 0)
    - return err;

    err = add_volume(codec, name, 0,
    HDA_COMPOSE_AMP_VAL(dac, 3, 0, HDA_OUTPUT), 0, &kctl);
    if (err < 0)
    return err;
    - err = snd_ctl_add_slave(spec->vmaster_vol, kctl);
    - if (err < 0)
    - return err;

    if (cfg->speaker_outs) {
    err = snd_hda_ctl_add(codec, 0,



    \
     
     \ /
      Last update: 2012-01-16 20:07    [W:4.319 / U:0.404 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site