From c8ecf30b5facac5899a71a08bef9af47b17e5b73 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 8 May 2009 16:03:20 +0200
Subject: [PATCH] --- yaml --- r: 148413 b: refs/heads/master c:
 22e336b776f743cbabfc5c946bff9ccf7ccc756b h: refs/heads/master i:   148411:
 34c584888a1d05208074d02420fba87a642f1989 v: v3

---
 [refs]                               | 2 +-
 trunk/sound/pci/hda/patch_sigmatel.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0ea6f039fcdd..5d5177af2ad4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a9fd4f3fcdc7e5757424f7e5888f660cf34bb1a9
+refs/heads/master: 22e336b776f743cbabfc5c946bff9ccf7ccc756b
diff --git a/trunk/sound/pci/hda/patch_sigmatel.c b/trunk/sound/pci/hda/patch_sigmatel.c
index 76487de33c84..ecf53f755a09 100644
--- a/trunk/sound/pci/hda/patch_sigmatel.c
+++ b/trunk/sound/pci/hda/patch_sigmatel.c
@@ -4084,7 +4084,12 @@ static int stac92xx_init(struct hda_codec *codec)
 				pinctl = snd_hda_codec_read(codec, nid, 0,
 					AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
 				/* if PINCTL already set then skip */
-				if (!(pinctl & AC_PINCTL_IN_EN)) {
+				/* Also, if both INPUT and OUTPUT are set,
+				 * it must be a BIOS bug; need to override, too
+				 */
+				if (!(pinctl & AC_PINCTL_IN_EN) ||
+				    (pinctl & AC_PINCTL_OUT_EN)) {
+					pinctl &= ~AC_PINCTL_OUT_EN;
 					pinctl |= AC_PINCTL_IN_EN;
 					stac92xx_auto_set_pinctl(codec, nid,
 								 pinctl);