diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-11-24 07:51:11 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-12-13 15:29:29 -0800 |
| commit | e47433f59a45c7e5d3ab54d8d7eabb91aa202da7 (patch) | |
| tree | f6097b783aaf8a788803bdf27bc8e5aa2c8c0ed3 /sound | |
| parent | c7b7f1613bcfdd8e6ccaeea8a57daf9a3a122fc2 (diff) | |
| download | linux-stable-e47433f59a45c7e5d3ab54d8d7eabb91aa202da7.tar.gz linux-stable-e47433f59a45c7e5d3ab54d8d7eabb91aa202da7.tar.bz2 linux-stable-e47433f59a45c7e5d3ab54d8d7eabb91aa202da7.zip | |
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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 23ff79a68175..6114632a7d0a 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); |