---

yaml --- r: 264140 b: refs/heads/master c: 5fe6e01 h: refs/heads/master v: v3
git-mirror · Sep 26, 2011 · 01628aa · 01628aa
1 parent a3cc34d
commit 01628aa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6656b15d675c9c6a049db48d50994b3cd4e76bd6
+refs/heads/master: 5fe6e0151dbd969f5fbcd94d05c968b76d76952b
diff --git a/trunk/sound/pci/hda/patch_realtek.c b/trunk/sound/pci/hda/patch_realtek.c
@@ -1321,7 +1321,9 @@ static int alc_subsystem_id(struct hda_codec *codec,
 	 * 15   : 1 --> enable the function "Mute internal speaker
 	 *	        when the external headphone out jack is plugged"
 	 */
-	if (!spec->autocfg.hp_pins[0]) {
+	if (!spec->autocfg.hp_pins[0] &&
+	    !(spec->autocfg.line_out_pins[0] &&
+	      spec->autocfg.line_out_type == AUTO_PIN_HP_OUT)) {
 		hda_nid_t nid;
 		tmp = (ass >> 11) & 0x3;	/* HP to chassis */
 		if (tmp == 0)