---

yaml --- r: 353156 b: refs/heads/master c: 02aba55 h: refs/heads/master v: v3
git-mirror · Jan 16, 2013 · 04a41f8 · 04a41f8
1 parent 6fd8ba8
commit 04a41f8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c0f3b21643487e2bbf8af534a33ffd2857e18fa1
+refs/heads/master: 02aba550537a666b8d09346f39d6372c78b115a5
diff --git a/trunk/sound/pci/hda/hda_generic.c b/trunk/sound/pci/hda/hda_generic.c
@@ -2826,6 +2826,9 @@ static int parse_mic_boost(struct hda_codec *codec)
 			struct nid_path *path;
 			unsigned int val;
 
+			if (!nid_has_volume(codec, nid, HDA_INPUT))
+				continue;
+
 			label = hda_get_autocfg_input_label(codec, cfg, i);
 			if (prev_label && !strcmp(label, prev_label))
 				type_idx++;