summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-11-24 07:51:11 +0100
committerTakashi Iwai <tiwai@suse.de>2008-11-25 15:15:05 +0100
commit95026623da32848bc93fbfb472dc8737487df450 (patch)
tree0eeaa23d744071017c4f26e36a5a6460bf2693a9 /sound
parentf73d35853e9263c7c404f0d6c0fe3d83fc6fd5c0 (diff)
downloadlinux-stable-95026623da32848bc93fbfb472dc8737487df450.tar.gz
linux-stable-95026623da32848bc93fbfb472dc8737487df450.tar.bz2
linux-stable-95026623da32848bc93fbfb472dc8737487df450.zip
ALSA: hda - No 'Headphone as Line-out' swich without line-outs
STAC/IDT driver creates "Headphone as Line-Out" switch even if there is no line-out pins on the machine. For devices only with headpohnes and speaker-outs, this switch shouldn't be created. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/patch_sigmatel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 5a29699c6fdb..7f7d899ff13a 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -2891,7 +2891,7 @@ static int stac92xx_auto_create_multi_out_ctls(struct hda_codec *codec,
cfg->hp_outs && !spec->multiout.hp_nid)
spec->multiout.hp_nid = nid;
- if (cfg->hp_outs > 1) {
+ if (cfg->hp_outs > 1 && cfg->line_out_type == AUTO_PIN_LINE_OUT) {
err = stac92xx_add_control(spec,
STAC_CTL_WIDGET_HP_SWITCH,
"Headphone as Line Out Switch",