瀏覽代碼

[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>
Takashi Iwai 18 年之前
父節點
當前提交
6afeb11de5
共有 1 個文件被更改,包括 3 次插入2 次删除
  1. 3 2
      sound/pci/hda/hda_generic.c

+ 3 - 2
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 "Front Aux";
 		return "Aux";
 		return "Aux";
 	case AC_JACK_MIC_IN:
 	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;
 			*pinctl |= AC_PINCTL_VREF_80;
 		if ((location & 0x0f) == AC_JACK_LOC_FRONT)
 		if ((location & 0x0f) == AC_JACK_LOC_FRONT)
 			return "Front Mic";
 			return "Front Mic";