]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ALSA: hda - No 'Headphone as Line-out' swich without line-outs
authorTakashi Iwai <tiwai@suse.de>
Mon, 24 Nov 2008 06:51:11 +0000 (07:51 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Sat, 13 Dec 2008 23:29:29 +0000 (15:29 -0800)
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>
sound/pci/hda/patch_sigmatel.c

index 23ff79a68175b9f0cfd56556cb973be959f65222..6114632a7d0a17d27bb9b09db872a5b1b3b80c18 100644 (file)
@@ -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);