projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f9cc8a8
)
[ALSA] hda-codec - Fix NULL dereference in generic hda code
author
Takashi Iwai
<tiwai@suse.de>
Mon, 18 Dec 2006 15:16:04 +0000
(16:16 +0100)
committer
Jaroslav Kysela
<perex@suse.cz>
Tue, 9 Jan 2007 08:06:17 +0000
(09:06 +0100)
Fix NULL dereference in hda_generic.c.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
sound/pci/hda/hda_generic.c
patch
|
blob
|
history
diff --git
a/sound/pci/hda/hda_generic.c
b/sound/pci/hda/hda_generic.c
index 97e9af130b7109fcee9ac0933d360d82a667ea0f..1589d2f2917f23aa3cc31652501e7281a15d5dde 100644
(file)
--- 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";