diff --git a/[refs] b/[refs]
index d7aa0f185a18..b8d678dba705 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 21cd683d318041c63876b4acbebb3f6d9d80597b
+refs/heads/master: ccfcf7d151c01969133b5555eed635537c41c944
diff --git a/trunk/sound/pci/hda/patch_hdmi.c b/trunk/sound/pci/hda/patch_hdmi.c
index 72a3b26736ae..db8f6928f839 100644
--- a/trunk/sound/pci/hda/patch_hdmi.c
+++ b/trunk/sound/pci/hda/patch_hdmi.c
@@ -1415,13 +1415,15 @@ static int simple_playback_init(struct hda_codec *codec)
 	int i;
 
 	for (i = 0; i < spec->num_pins; i++) {
-		snd_hda_codec_write(codec, spec->pins[i].pin_nid, 0,
+		hda_nid_t pin = spec->pins[i].pin_nid;
+		snd_hda_codec_write(codec, pin, 0,
 				    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
 		/* some codecs require to unmute the pin */
-		if (get_wcaps(codec, spec->pins[i].pin_nid) & AC_WCAP_OUT_AMP)
-			snd_hda_codec_write(codec, spec->pins[i].pin_nid, 0,
+		if (get_wcaps(codec, pin) & AC_WCAP_OUT_AMP)
+			snd_hda_codec_write(codec, pin, 0,
 					    AC_VERB_SET_AMP_GAIN_MUTE,
 					    AMP_OUT_UNMUTE);
+		snd_hda_jack_detect_enable(codec, pin, pin);
 	}
 	snd_hda_jack_report_sync(codec);
 	return 0;