diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-04-20 13:08:40 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-04-20 13:08:40 +0200 |
| commit | 6942c103fb4b0ce91be910a716044ac181a9c2dd (patch) | |
| tree | 5b8314d357777293411e3ff9d863f4b6e52947b6 | |
| parent | 4740860b534e86d7db3b26cbd980bec8e4c807e8 (diff) | |
| download | linux-3.10-6942c103fb4b0ce91be910a716044ac181a9c2dd.tar.gz linux-3.10-6942c103fb4b0ce91be910a716044ac181a9c2dd.tar.bz2 linux-3.10-6942c103fb4b0ce91be910a716044ac181a9c2dd.zip | |
ALSA: hda - Skip pin capability sanity check for bogus values
Some old codecs like ALC880 seem to give a bogus pin capability value 0
occasionally. This breaks the new sanity check in snd_hda_set_pin_ctl().
Skip the sanity checks in such a case.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | sound/pci/hda/hda_codec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index 8b8b74a1284..408613c13f4 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -4827,14 +4827,14 @@ int _snd_hda_set_pin_ctl(struct hda_codec *codec, hda_nid_t pin, { if (val) { unsigned int cap = snd_hda_query_pin_caps(codec, pin); - if (val & AC_PINCTL_OUT_EN) { + if (cap && (val & AC_PINCTL_OUT_EN)) { if (!(cap & AC_PINCAP_OUT)) val &= ~(AC_PINCTL_OUT_EN | AC_PINCTL_HP_EN); else if ((val & AC_PINCTL_HP_EN) && !(cap & AC_PINCAP_HP_DRV)) val &= ~AC_PINCTL_HP_EN; } - if (val & AC_PINCTL_IN_EN) { + if (cap && (val & AC_PINCTL_IN_EN)) { if (!(cap & AC_PINCAP_IN)) val &= ~(AC_PINCTL_IN_EN | AC_PINCTL_VREFEN); } |