ALSA: usb-audio: UAC3: Parse Input Terminal number of channels.

Obtain the number of channels for the Input Terminal from the
Logical Cluster Descriptor. This achieves a useful minimal parsing
of this unit so it can be used in other units in the topology.

Signed-off-by: Jorge Sanjuan <jorge.sanjuan@codethink.co.uk>
Reviewed-by: Ruslan Bilovol <ruslan.bilovol@gmail.com>
Tested-by: Ruslan Bilovol <ruslan.bilovol@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index fb77847cbffc095a593ba805fdb7a4cb3d124774..bf74e7edc92b011a054d939b9853f4194b4ef78b 100644 (file)
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -902,8 +902,12 @@ static int check_input_term(struct mixer_build *state, int id,
                                term->id = id;
                                term->type = le16_to_cpu(d->wTerminalType);
 
-                               /* REVISIT: UAC3 IT doesn't have channels/cfg */
-                               term->channels = 0;
+                               err = get_cluster_channels_v3(state, le16_to_cpu(d->wClusterDescrID));
+                               if (err < 0)
+                                       return err;
+                               term->channels = err;
+
+                               /* REVISIT: UAC3 IT doesn't have channels cfg */
                                term->chconfig = 0;
 
                                term->name = le16_to_cpu(d->wTerminalDescrStr);