From: Mark Hills <mark@pogo.org.uk>
Date: Sat, 14 Apr 2012 16:19:23 +0000 (+0100)
Subject: ALSA: snd-usb-audio: Skip un-parseable mixer units instead of erroring
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=284a8dd6f0fb16029198b5b34437499d504b567c;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

ALSA: snd-usb-audio: Skip un-parseable mixer units instead of erroring

Some interfaces reference endpoints which do not exists. To
accomodate these, do not fail completely, but skip over them.

This allows the Electrix Ebox-44 with earlier firmware to be
detected and used for audio.

Signed-off-by: Mark Hills <mark@pogo.org.uk>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index ab23869c01bb..c374c7242ab2 100644
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -1388,7 +1388,7 @@ static int parse_audio_mixer_unit(struct mixer_build *state, int unitid, void *r
 	for (pin = 0; pin < input_pins; pin++) {
 		err = parse_audio_unit(state, desc->baSourceID[pin]);
 		if (err < 0)
-			return err;
+			continue;
 		err = check_input_term(state, desc->baSourceID[pin], &iterm);
 		if (err < 0)
 			return err;