Merge branch 'fix/hda' into for-linus
* fix/hda: ALSA: hda - Fix line-in on Mac Mini Core2 Duo
This commit is contained in:
commit
b40814b8c0
|
@ -4079,7 +4079,12 @@ static int stac92xx_init(struct hda_codec *codec)
|
||||||
pinctl = snd_hda_codec_read(codec, nid, 0,
|
pinctl = snd_hda_codec_read(codec, nid, 0,
|
||||||
AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
|
AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
|
||||||
/* if PINCTL already set then skip */
|
/* 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;
|
pinctl |= AC_PINCTL_IN_EN;
|
||||||
stac92xx_auto_set_pinctl(codec, nid,
|
stac92xx_auto_set_pinctl(codec, nid,
|
||||||
pinctl);
|
pinctl);
|
||||||
|
|
Loading…
Reference in a new issue