From 515714fae9cd17b9b7380637c98ccc8033ff4c64 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 13 Aug 2009 08:23:24 +0200
Subject: [PATCH] --- yaml --- r: 157849 b: refs/heads/master c:
 1c4bdf9be010ae7c2324c0a90dd2296e0d1a775e h: refs/heads/master i:   157847:
 fcbc03ac72f1183fd9733882d791ef0060853d82 v: v3

---
 [refs]                               | 2 +-
 trunk/sound/pci/hda/patch_sigmatel.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index fea7a4f8bdc1..330d12aa4be1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5908589f318835f515bf94829650d36dcb2d9024
+refs/heads/master: 1c4bdf9be010ae7c2324c0a90dd2296e0d1a775e
diff --git a/trunk/sound/pci/hda/patch_sigmatel.c b/trunk/sound/pci/hda/patch_sigmatel.c
index 276073060576..3ac0112566b1 100644
--- a/trunk/sound/pci/hda/patch_sigmatel.c
+++ b/trunk/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];