aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-01-09 02:41:41 -0500
committerTakashi Iwai <tiwai@suse.de>2013-01-12 02:44:16 -0500
commitca29683bd63a463d48934dc5b50ec4aecbfaa7c2 (patch)
treef3db8984af6610a6e5117e8158566d94156eb5e1
parentd12daf6f41693b6b34351b37b6d05d1a6f9b3472 (diff)
ALSA: hda - Exclude aamix from capture paths
The capture paths shouldn't contain the analog loopback mixer. Pass a proper argument to exclude the aamix NID. Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--sound/pci/hda/hda_generic.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
index b488c62ed97d..f07b32668f42 100644
--- a/sound/pci/hda/hda_generic.c
+++ b/sound/pci/hda/hda_generic.c
@@ -2110,13 +2110,9 @@ static int create_input_ctls(struct hda_codec *codec)
2110 2110
2111 if (!is_reachable_path(codec, pin, adc)) 2111 if (!is_reachable_path(codec, pin, adc))
2112 continue; 2112 continue;
2113 path = snd_hda_add_new_path(codec, pin, adc, 0); 2113 path = snd_hda_add_new_path(codec, pin, adc, -mixer);
2114 if (!path) { 2114 if (!path)
2115 snd_printd(KERN_ERR
2116 "invalid input path 0x%x -> 0x%x\n",
2117 pin, adc);
2118 continue; 2115 continue;
2119 }
2120 print_nid_path("input", path); 2116 print_nid_path("input", path);
2121 spec->input_paths[imux_idx][c] = 2117 spec->input_paths[imux_idx][c] =
2122 snd_hda_get_path_idx(codec, path); 2118 snd_hda_get_path_idx(codec, path);