From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 13 Aug 2009 06:23:24 +0000 (+0200)
Subject: ALSA: hda - Enable line-out detection only with speakers
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=1c4bdf9be010ae7c2324c0a90dd2296e0d1a775e;p=deliverable%2Flinux.git

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>
---

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)
 			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];