---

yaml --- r: 353108 b: refs/heads/master c: ca29683 h: refs/heads/master v: v3
git-mirror · Jan 12, 2013 · 607bcc8 · 607bcc8
1 parent a0a8756
commit 607bcc8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d12daf6f41693b6b34351b37b6d05d1a6f9b3472
+refs/heads/master: ca29683bd63a463d48934dc5b50ec4aecbfaa7c2
diff --git a/trunk/sound/pci/hda/hda_generic.c b/trunk/sound/pci/hda/hda_generic.c
@@ -2110,13 +2110,9 @@ static int create_input_ctls(struct hda_codec *codec)
 
 			if (!is_reachable_path(codec, pin, adc))
 				continue;
-			path = snd_hda_add_new_path(codec, pin, adc, 0);
-			if (!path) {
-				snd_printd(KERN_ERR
-					   "invalid input path 0x%x -> 0x%x\n",
-					   pin, adc);
+			path = snd_hda_add_new_path(codec, pin, adc, -mixer);
+			if (!path)
 				continue;
-			}
 			print_nid_path("input", path);
 			spec->input_paths[imux_idx][c] =
 				snd_hda_get_path_idx(codec, path);