From 0824b077b75c19253b45c5a455775c331acd54ee Mon Sep 17 00:00:00 2001 From: Maxim Levitsky maximlevitsky@gmail.com Date: Thu, 18 Oct 2007 03:35:37 +0200 Subject: [PATCH] [HDA] [STAC] Since there is now a master volume control, don't call the headphone output "Master", it isn't strictly correct anyway
Signed-off-by: Maxim Levitsky maximlevitsky@gmail.com --- pci/hda/patch_sigmatel.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/pci/hda/patch_sigmatel.c b/pci/hda/patch_sigmatel.c index 6dffa54..7f157a6 100644 --- a/pci/hda/patch_sigmatel.c +++ b/pci/hda/patch_sigmatel.c @@ -1907,12 +1907,7 @@ static int stac92xx_auto_create_hp_ctls(struct hda_codec *codec, return err; } if (spec->multiout.hp_nid) { - const char *pfx; - if (old_num_dacs == spec->multiout.num_dacs) - pfx = "Master"; - else - pfx = "Headphone"; - err = create_controls(spec, pfx, spec->multiout.hp_nid, 3); + err = create_controls(spec, "Headphone", spec->multiout.hp_nid, 3); if (err < 0) return err; }