aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-08-13 02:23:24 -0400
committerTakashi Iwai <tiwai@suse.de>2009-08-13 02:27:38 -0400
commit1c4bdf9be010ae7c2324c0a90dd2296e0d1a775e (patch)
tree3551faedf433d7b0425ba8a8202a9053772fef9f
parent5908589f318835f515bf94829650d36dcb2d9024 (diff)
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>
-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 276073060576..3ac0112566b1 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)
4350 hda_nid_t nid = cfg->hp_pins[i]; 4350 hda_nid_t nid = cfg->hp_pins[i];
4351 enable_pin_detect(codec, nid, STAC_HP_EVENT); 4351 enable_pin_detect(codec, nid, STAC_HP_EVENT);
4352 } 4352 }
4353 if (cfg->line_out_type == AUTO_PIN_LINE_OUT) { 4353 if (cfg->line_out_type == AUTO_PIN_LINE_OUT &&
4354 cfg->speaker_outs > 0) {
4354 /* enable pin-detect for line-outs as well */ 4355 /* enable pin-detect for line-outs as well */
4355 for (i = 0; i < cfg->line_outs; i++) { 4356 for (i = 0; i < cfg->line_outs; i++) {
4356 hda_nid_t nid = cfg->line_out_pins[i]; 4357 hda_nid_t nid = cfg->line_out_pins[i];