summaryrefslogtreecommitdiff
path: root/sound/pci/hda
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-01-09 08:41:41 +0100
committerTakashi Iwai <tiwai@suse.de>2013-01-12 08:44:16 +0100
commitca29683bd63a463d48934dc5b50ec4aecbfaa7c2 (patch)
treef3db8984af6610a6e5117e8158566d94156eb5e1 /sound/pci/hda
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>
Diffstat (limited to 'sound/pci/hda')
-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)
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);