From 4b3068e25d0b7fc8e2c73b5338337ac3ec6ce8f7 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 18 Dec 2006 16:16:04 +0100
Subject: [PATCH] --- yaml --- r: 45419 b: refs/heads/master c:
 6afeb11de5b28e47adea1459c35e598bb98424d6 h: refs/heads/master i:   45417:
 eeb801f6b462257e7b491d664f215e70fc568b98   45415:
 097ad51ea7837ca5c424f65da1d0c79dc485ed3a v: v3

---
 [refs]                            | 2 +-
 trunk/sound/pci/hda/hda_generic.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 2128ca3ed104..2415d887396d 100644
--- 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
index 97e9af130b71..1589d2f2917f 100644
--- 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";