diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-05-10 12:06:55 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-05-10 12:06:55 +0200 |
| commit | b40814b8c028f0fe4465e17c8bb4ca0d3258fa52 (patch) | |
| tree | 523177808ed22dd9cd5b1b6249d7203bc7530dbc /sound | |
| parent | e56d498d0aef985d1b321a10c0f2276efb93545e (diff) | |
| parent | 5dd17cb992ef4c1ebb1a2d60cbef4b6967974673 (diff) | |
| download | op-kernel-dev-b40814b8c028f0fe4465e17c8bb4ca0d3258fa52.zip op-kernel-dev-b40814b8c028f0fe4465e17c8bb4ca0d3258fa52.tar.gz | |
Merge branch 'fix/hda' into for-linus
* fix/hda:
ALSA: hda - Fix line-in on Mac Mini Core2 Duo
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 917bc5d..03b3646 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); |
