From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 14 Mar 2008 08:18:32 +0000 (+0100)
Subject: [ALSA] hda-codec - Fix orphan Headphone controls in STAC codecs
X-Git-Tag: v2.6.26-rc1~1087^2~130
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2626a263ffc2369499442933b1c313de0a066ede;p=linux-2.6-omap-h63xx.git

[ALSA] hda-codec - Fix orphan Headphone controls in STAC codecs

Currently, the headphone controls are created as Master wrongly in
some cases, and this prevents the virtual master controls.
The patch fixes the problem by simply using "Headphone" always for
headphone controls.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index b75bf347565..b8e69a1b93f 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -2509,12 +2509,8 @@ 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;
 	}