From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 24 Nov 2008 06:51:11 +0000 (+0100)
Subject: ALSA: hda - No 'Headphone as Line-out' swich without line-outs
X-Git-Tag: v2.6.27.9~26
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e47433f59a45c7e5d3ab54d8d7eabb91aa202da7;p=thirdparty%2Fkernel%2Fstable.git

ALSA: hda - No 'Headphone as Line-out' swich without line-outs

commit 95026623da32848bc93fbfb472dc8737487df450 upstream

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 23ff79a68175b..6114632a7d0a1 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -2505,7 +2505,7 @@ static int stac92xx_auto_create_multi_out_ctls(struct hda_codec *codec,
 		}
 	}
 
-	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", 0);