Merge branch 'fix/hda' into for-linus

* fix/hda:
  ALSA: hda - Fix line-in on Mac Mini Core2 Duo

1 files changed, 6 insertions, 1 deletions

diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 917bc5d3ac2..03b3646018a 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -4079,7 +4079,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);