From 607bcc87b48e3af5f37fdac7255e0d5a8666ec1f Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Wed, 9 Jan 2013 08:41:41 +0100 Subject: [PATCH] --- yaml --- r: 353108 b: refs/heads/master c: ca29683bd63a463d48934dc5b50ec4aecbfaa7c2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/hda_generic.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 7298d2445696..5f7d54a9352e 100644 --- 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 index b488c62ed97d..f07b32668f42 100644 --- 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);