---

yaml --- r: 45419 b: refs/heads/master c: 6afeb11 h: refs/heads/master i: 45417: eeb801f 45415: 097ad51 v: v3
git-mirror · Jan 9, 2007 · 4b3068e · 4b3068e
1 parent 5d6660d
commit 4b3068e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9cc8a8b1887e6e2bb430405d0a4f9b5fb39fa5d
+refs/heads/master: 6afeb11de5b28e47adea1459c35e598bb98424d6
diff --git a/trunk/sound/pci/hda/hda_generic.c b/trunk/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";