---

yaml --- r: 170360 b: refs/heads/master c: bfc9902 h: refs/heads/master v: v3
git-mirror · Nov 27, 2009 · 6549b5a · 6549b5a
1 parent 0d472d1
commit 6549b5a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b587fc4d35afb1bc0fc3d890084bb14c78372dc
+refs/heads/master: bfc9902599549736b9c6445e1e2235b8542f64a6
diff --git a/trunk/sound/pci/hda/patch_sigmatel.c b/trunk/sound/pci/hda/patch_sigmatel.c
@@ -4440,7 +4440,14 @@ static inline int get_pin_presence(struct hda_codec *codec, hda_nid_t nid)
 {
 	if (!nid)
 		return 0;
-	return snd_hda_jack_detect(codec, nid);
+	/* NOTE: we can't use snd_hda_jack_detect() here because STAC/IDT
+	 * codecs behave wrongly when SET_PIN_SENSE is triggered, although
+	 * the pincap gives TRIG_REQ bit.
+	 */
+	if (snd_hda_codec_read(codec, nid, 0, AC_VERB_GET_PIN_SENSE, 0) &
+	    AC_PINSENSE_PRESENCE)
+		return 1;
+	return 0;
 }
 
 static void stac92xx_line_out_detect(struct hda_codec *codec,