From 60081b35c68ba6a466dee08de581be06999c930a Mon Sep 17 00:00:00 2001

From: Takashi Iwai <tiwai@suse.de>

Date: Thu, 13 Feb 2020 12:20:59 +0100

Subject: [PATCH] ALSA: usb-audio: Parse source ID of UAC2 effect unit

Git-commit: 60081b35c68ba6a466dee08de581be06999c930a

Patch-mainline: v5.7-rc1

References: bsc#1051510

During parsing the input source, we currently cut off at the Effect

Unit node without parsing further its source id.  It's no big problem,

so far, but it should be more consistent to parse it properly.

This patch adds the recursive parsing in parse_term_effect_unit().

It doesn't add anything in the audio unit parser itself, and the

effect unit itself is still skipped, though.

Buglink: https://bugzilla.kernel.org/show_bug.cgi?id=206147

Link: https://lore.kernel.org/r/20200213112059.18745-3-tiwai@suse.de

Signed-off-by: Takashi Iwai <tiwai@suse.de>

---

 sound/usb/mixer.c | 6 ++++++

 1 file changed, 6 insertions(+)

diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c

index 81b2db0edd5f..56d0878e4999 100644

--- a/sound/usb/mixer.c

+++ b/sound/usb/mixer.c

@@ -901,6 +901,12 @@ static int parse_term_effect_unit(struct mixer_build *state,

 				  struct usb_audio_term *term,

 				  void *p1, int id)

 {

+	struct uac2_effect_unit_descriptor *d = p1;

+	int err;

+

+	err = __check_input_term(state, d->bSourceID, term);

+	if (err < 0)

+		return err;

 	term->type = UAC3_EFFECT_UNIT << 16; /* virtual type */

 	term->id = id;

 	return 0;

-- 

2.16.4