aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-08-13 08:23:24 +0200
committerTakashi Iwai <tiwai@suse.de>2009-08-13 08:27:38 +0200
commit1c4bdf9be010ae7c2324c0a90dd2296e0d1a775e (patch)
tree3551faedf433d7b0425ba8a8202a9053772fef9f /sound
parent5908589f318835f515bf94829650d36dcb2d9024 (diff)
downloadkernel_samsung_tuna-1c4bdf9be010ae7c2324c0a90dd2296e0d1a775e.zip
kernel_samsung_tuna-1c4bdf9be010ae7c2324c0a90dd2296e0d1a775e.tar.gz
kernel_samsung_tuna-1c4bdf9be010ae7c2324c0a90dd2296e0d1a775e.tar.bz2
ALSA: hda - Enable line-out detection only with speakers
Enable line-out detection for IDT/STAC codecs only when speaker pins exist. In some cases, the speaker itself is identified as line-out, and this confuses the situation. Only the extra line-outs should do auto-muting. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/patch_sigmatel.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 2760730..3ac0112 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -4350,7 +4350,8 @@ static int stac92xx_init(struct hda_codec *codec)
hda_nid_t nid = cfg->hp_pins[i];
enable_pin_detect(codec, nid, STAC_HP_EVENT);
}
- if (cfg->line_out_type == AUTO_PIN_LINE_OUT) {
+ if (cfg->line_out_type == AUTO_PIN_LINE_OUT &&
+ cfg->speaker_outs > 0) {
/* enable pin-detect for line-outs as well */
for (i = 0; i < cfg->line_outs; i++) {
hda_nid_t nid = cfg->line_out_pins[i];