From: Takashi Iwai 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.28-rc7~50^2^2~2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=95026623da32848bc93fbfb472dc8737487df450;p=linux-2.6-omap-h63xx.git 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 --- diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 5a29699c6fd..7f7d899ff13 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",