summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2008-11-24 07:51:11 +0100
committerTakashi Iwai <tiwai@suse.de>2008-11-24 07:51:11 +0100
commita9cb5c90539dd618029884701760fe79b9b83102 (patch)
treebc93f3187728c2136a90108cab7f75a85f09d9be
parent4805286bffa9d7b85223ab2038f08b4b6322a176 (diff)
downloadkernel-crypto-a9cb5c90539dd618029884701760fe79b9b83102.tar.gz
kernel-crypto-a9cb5c90539dd618029884701760fe79b9b83102.tar.xz
kernel-crypto-a9cb5c90539dd618029884701760fe79b9b83102.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>
-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 ce34e4dfe98..7cd395a175e 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -2962,7 +2962,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",