---

yaml --- r: 157849 b: refs/heads/master c: 1c4bdf9 h: refs/heads/master i: 157847: fcbc03a v: v3
git-mirror · Aug 13, 2009 · 515714f · 515714f
1 parent 7e35f2a
commit 515714f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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];