aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2006-12-18 10:16:04 -0500
committerJaroslav Kysela <perex@suse.cz>2007-01-09 03:06:17 -0500
commit6afeb11de5b28e47adea1459c35e598bb98424d6 (patch)
tree07f4dba0e2fb094b448eb9863de7b6364b768add /sound
parentf9cc8a8b1887e6e2bb430405d0a4f9b5fb39fa5d (diff)
[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.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
index 97e9af130b71..1589d2f2917f 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)
485 return "Front Aux"; 485 return "Front Aux";
486 return "Aux"; 486 return "Aux";
487 case AC_JACK_MIC_IN: 487 case AC_JACK_MIC_IN:
488 if (node->pin_caps & 488 if (pinctl &&
489 (AC_PINCAP_VREF_80 << AC_PINCAP_VREF_SHIFT)) 489 (node->pin_caps &
490 (AC_PINCAP_VREF_80 << AC_PINCAP_VREF_SHIFT)))
490 *pinctl |= AC_PINCTL_VREF_80; 491 *pinctl |= AC_PINCTL_VREF_80;
491 if ((location & 0x0f) == AC_JACK_LOC_FRONT) 492 if ((location & 0x0f) == AC_JACK_LOC_FRONT)
492 return "Front Mic"; 493 return "Front Mic";