From 503b6b4292a1e4b0fe57304d73be3b7d92152014 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Sun, 24 Jan 2010 11:19:27 +0100
Subject: [PATCH] --- yaml --- r: 182738 b: refs/heads/master c:
 23d2df5b0db67fa90d3caf4b2d2f21ca33ec9c11 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/sound/pci/hda/patch_conexant.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 94b35cc46876..aba996bff559 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ecda0cff9df77d3f7d388bd4966e61f1947d2c95
+refs/heads/master: 23d2df5b0db67fa90d3caf4b2d2f21ca33ec9c11
diff --git a/trunk/sound/pci/hda/patch_conexant.c b/trunk/sound/pci/hda/patch_conexant.c
index 250b74f8136e..9077e4174ee6 100644
--- a/trunk/sound/pci/hda/patch_conexant.c
+++ b/trunk/sound/pci/hda/patch_conexant.c
@@ -1605,6 +1605,11 @@ static void cxt5051_update_speaker(struct hda_codec *codec)
 {
 	struct conexant_spec *spec = codec->spec;
 	unsigned int pinctl;
+	/* headphone pin */
+	pinctl = (spec->hp_present && spec->cur_eapd) ? PIN_HP : 0;
+	snd_hda_codec_write(codec, 0x16, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
+			    pinctl);
+	/* speaker pin */
 	pinctl = (!spec->hp_present && spec->cur_eapd) ? PIN_OUT : 0;
 	snd_hda_codec_write(codec, 0x1a, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
 			    pinctl);