diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-05-08 16:03:20 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-05-08 16:03:20 +0200 |
| commit | 22e336b776f743cbabfc5c946bff9ccf7ccc756b (patch) | |
| tree | 4f6210f5da90bbcd3140869e0669d9f052cec132 /sound | |
| parent | ALSA: hda - Clean up Realtek auto-mute unsol routines (diff) | |
| parent | ALSA: hda - Fix line-in on Mac Mini Core2 Duo (diff) | |
| download | linux-22e336b776f743cbabfc5c946bff9ccf7ccc756b.tar.xz linux-22e336b776f743cbabfc5c946bff9ccf7ccc756b.zip | |
Merge branch 'fix/hda' into topic/hda
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); |