diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-05-08 07:59:56 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-05-08 07:59:56 +0200 |
| commit | e9518d120c22b80ab66baa9901258fe2dd930878 (patch) | |
| tree | 7d50aeddb0440b5efaf706f7af0eca72c9a87026 /sound | |
| parent | 8e73335953a3ee127d01af0bcf9757bec0d858d5 (diff) | |
| parent | 5dd17cb992ef4c1ebb1a2d60cbef4b6967974673 (diff) | |
Merge branch 'fix/hda' into for-next
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 76487de33c84..ecf53f755a09 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c @@ -4084,7 +4084,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); |