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

Commit b40814b8 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/hda' into for-linus

* fix/hda:
  ALSA: hda - Fix line-in on Mac Mini Core2 Duo
parents e56d498d 5dd17cb9
Loading
Loading
Loading
Loading
+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);