From 48ae063734faef80381c124032b98f2c8ec4f7b6 Mon Sep 17 00:00:00 2001 From: David Henningsson Date: Mon, 2 Jan 2012 12:40:15 +0100 Subject: [PATCH] --- yaml --- r: 284221 b: refs/heads/master c: 40d03e63e91af8ddccdfd5a536cc2a6e51433e1d h: refs/heads/master i: 284219: ffe2e4d4724b774d5821f0df9e9ee097e07e3aba v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/patch_cirrus.c | 13 +------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 4917807e0ee6..acd6bfe55d4d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 716e5db48861be408f9bbb5b49c72818ba85e4d2 +refs/heads/master: 40d03e63e91af8ddccdfd5a536cc2a6e51433e1d diff --git a/trunk/sound/pci/hda/patch_cirrus.c b/trunk/sound/pci/hda/patch_cirrus.c index acfb64534bf0..913955895094 100644 --- a/trunk/sound/pci/hda/patch_cirrus.c +++ b/trunk/sound/pci/hda/patch_cirrus.c @@ -1779,30 +1779,19 @@ static int build_cs421x_output(struct hda_codec *codec) 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,