---

yaml --- r: 148406 b: refs/heads/master c: 2a2ed0d h: refs/heads/master v: v3
git-mirror · Apr 28, 2009 · 982fe5d · 982fe5d
1 parent 0f4cd53
commit 982fe5d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 299f293b3428ae6d73406642cd7d41f08d524c83
+refs/heads/master: 2a2ed0dfc9ec44a899c7d4672f73f2c045099118
diff --git a/trunk/sound/pci/hda/patch_realtek.c b/trunk/sound/pci/hda/patch_realtek.c
@@ -1099,13 +1099,16 @@ static void alc_init_auto_hp(struct hda_codec *codec)
 		return;
 
 	if (!spec->autocfg.speaker_pins[0]) {
-		if (spec->autocfg.line_out_pins[0])
+		if (spec->autocfg.line_out_pins[0] &&
+		    spec->autocfg.line_out_type == AUTO_PIN_SPEAKER_OUT)
 			spec->autocfg.speaker_pins[0] =
 				spec->autocfg.line_out_pins[0];
 		else
 			return;
 	}
 
+	snd_printdd("realtek: Enable HP auto-muting on NID 0x%x\n",
+		    spec->autocfg.hp_pins[0]);
 	snd_hda_codec_write_cache(codec, spec->autocfg.hp_pins[0], 0,
 				  AC_VERB_SET_UNSOLICITED_ENABLE,
 				  AC_USRSP_EN | ALC880_HP_EVENT);