aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-03-14 04:18:32 -0400
committerTakashi Iwai <tiwai@suse.de>2008-04-24 06:00:24 -0400
commit2626a263ffc2369499442933b1c313de0a066ede (patch)
tree620a20f4b1b92a36170aeb635aac1a8b52e7ae38 /sound
parentd654a660355f9dc30d3a6bf1493d32363bde8570 (diff)
[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>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/patch_sigmatel.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index b75bf3475653..b8e69a1b93f0 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,
2509 return err; 2509 return err;
2510 } 2510 }
2511 if (spec->multiout.hp_nid) { 2511 if (spec->multiout.hp_nid) {
2512 const char *pfx; 2512 err = create_controls(spec, "Headphone",
2513 if (old_num_dacs == spec->multiout.num_dacs) 2513 spec->multiout.hp_nid, 3);
2514 pfx = "Master";
2515 else
2516 pfx = "Headphone";
2517 err = create_controls(spec, pfx, spec->multiout.hp_nid, 3);
2518 if (err < 0) 2514 if (err < 0)
2519 return err; 2515 return err;
2520 } 2516 }