---

yaml --- r: 216695 b: refs/heads/master c: 41c89ef h: refs/heads/master i: 216693: 2665ccf 216691: 52df0da 216687: 6b26495 v: v3
git-mirror · Sep 17, 2010 · b032268 · b032268
1 parent f950d5d
commit b032268
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9907790aa06bfc04bf78b445e732ea10039c61e4
+refs/heads/master: 41c89ef3aafea5f35601fa75edba90e7417f604e
diff --git a/trunk/sound/pci/hda/hda_codec.c b/trunk/sound/pci/hda/hda_codec.c
@@ -4648,8 +4648,11 @@ enum {
 static int get_mic_pin_attr(unsigned int def_conf)
 {
 	unsigned int loc = get_defcfg_location(def_conf);
-	if (get_defcfg_connect(def_conf) == AC_JACK_PORT_FIXED ||
-	    (loc & 0x30) == AC_JACK_LOC_INTERNAL)
+	unsigned int conn = get_defcfg_connect(def_conf);
+	/* Windows may claim the internal mic to be BOTH, too */
+	if (conn == AC_JACK_PORT_FIXED || conn == AC_JACK_PORT_BOTH)
+		return MIC_ATTR_INT;
+	if ((loc & 0x30) == AC_JACK_LOC_INTERNAL)
 		return MIC_ATTR_INT;
 	if ((loc & 0x30) == AC_JACK_LOC_SEPARATE)
 		return MIC_ATTR_DOCK;