ALSA: usb-audio: Recurse before saving terminal properties

The input terminal parser recurses into the referenced clock entity to verify
it is existant and thus the terminal descriptor is valid. The actual property
values of the term instance which is initially parsed must not be overriden by
the recursion. For this to work the term properties have to be assigned after
recursing into the referenced clock entity descriptors.

Signed-off-by: Julian Scheel <julian@jusst.de>
Acked-by: Daniel Mack <daniel@zonque.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index 81055d37af758eb4454458fecf2d418f9abe4ccf..c50790cb3f4d727988b0638cba5f9df470a9a1f3 100644 (file)
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -731,15 +731,21 @@ static int check_input_term(struct mixer_build *state, int id,
                                term->name = d->iTerminal;
                        } else { /* UAC_VERSION_2 */
                                struct uac2_input_terminal_descriptor *d = p1;
-                               term->type = le16_to_cpu(d->wTerminalType);
-                               term->channels = d->bNrChannels;
-                               term->chconfig = le32_to_cpu(d->bmChannelConfig);
-                               term->name = d->iTerminal;
 
-                               /* call recursively to get the clock selectors */
+                               /* call recursively to verify that the
+                                * referenced clock entity is valid */
                                err = check_input_term(state, d->bCSourceID, term);
                                if (err < 0)
                                        return err;
+
+                               /* save input term properties after recursion,
+                                * to ensure they are not overriden by the
+                                * recursion calls */
+                               term->id = id;
+                               term->type = le16_to_cpu(d->wTerminalType);
+                               term->channels = d->bNrChannels;
+                               term->chconfig = le32_to_cpu(d->bmChannelConfig);
+                               term->name = d->iTerminal;
                        }
                        return 0;
                case UAC_FEATURE_UNIT: {