diff options
| author | Takashi Iwai <tiwai@suse.de> | 2006-12-18 16:16:04 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2007-01-09 09:06:17 +0100 |
| commit | 6afeb11de5b28e47adea1459c35e598bb98424d6 (patch) | |
| tree | 07f4dba0e2fb094b448eb9863de7b6364b768add /sound | |
| parent | f9cc8a8b1887e6e2bb430405d0a4f9b5fb39fa5d (diff) | |
| download | op-kernel-dev-6afeb11de5b28e47adea1459c35e598bb98424d6.zip op-kernel-dev-6afeb11de5b28e47adea1459c35e598bb98424d6.tar.gz | |
[ALSA] hda-codec - Fix NULL dereference in generic hda code
Fix NULL dereference in hda_generic.c.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pci/hda/hda_generic.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c index 97e9af1..1589d2f 100644 --- a/sound/pci/hda/hda_generic.c +++ b/sound/pci/hda/hda_generic.c @@ -485,8 +485,9 @@ static const char *get_input_type(struct hda_gnode *node, unsigned int *pinctl) return "Front Aux"; return "Aux"; case AC_JACK_MIC_IN: - if (node->pin_caps & - (AC_PINCAP_VREF_80 << AC_PINCAP_VREF_SHIFT)) + if (pinctl && + (node->pin_caps & + (AC_PINCAP_VREF_80 << AC_PINCAP_VREF_SHIFT))) *pinctl |= AC_PINCTL_VREF_80; if ((location & 0x0f) == AC_JACK_LOC_FRONT) return "Front Mic"; |
