git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
a9fd4f3
)
Merge branch 'fix/hda' into topic/hda
author
Takashi Iwai
<tiwai@suse.de>
Fri, 8 May 2009 14:03:20 +0000
(16:03 +0200)
committer
Takashi Iwai
<tiwai@suse.de>
Fri, 8 May 2009 14:03:20 +0000
(16:03 +0200)
sound/pci/hda/patch_sigmatel.c
patch
|
blob
|
history
diff --git
a/sound/pci/hda/patch_sigmatel.c
b/sound/pci/hda/patch_sigmatel.c
index
76487de
..
ecf53f7
100644
(file)
--- 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);