Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5dd17cb9 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

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



BIOS on Mac Mini Core2 Duo sets both INPUT and OUTPUT pinctl bits to
the line-in jack, and it confuses the driver as if it's a valid input.
This patch adds the check of OUTPUT bit so that the driver fixes the
invalid pin setup.

Tested-by: default avatarTino Keitel <tino.keitel@gmx.de>
Cc: <stable@kernel.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 7315613f

sound/pci/hda/patch_sigmatel.c

+6 −1
Original line number Diff line number Diff line
@@ -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);