hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Julian Scheel 2015-08-19 09:28:09 +02:00 committed by Takashi Iwai
parent d5cf00c7ac
commit 9430e54789
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sound/usb/mixer.c
View File

@ -731,15 +731,21 @@ static int check_input_term(struct mixer_build *state, int id,
term->name = d->iTerminal; term->name = d->iTerminal;
} else { /* UAC_VERSION_2 */ } else { /* UAC_VERSION_2 */
struct uac2_input_terminal_descriptor *d = p1; struct uac2_input_terminal_descriptor *d = p1;
/* 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->type = le16_to_cpu(d->wTerminalType);
term->channels = d->bNrChannels; term->channels = d->bNrChannels;
term->chconfig = le32_to_cpu(d->bmChannelConfig); term->chconfig = le32_to_cpu(d->bmChannelConfig);
term->name = d->iTerminal; term->name = d->iTerminal;
/* call recursively to get the clock selectors */
err = check_input_term(state, d->bCSourceID, term);
if (err < 0)
return err;
} }
return 0; return 0;
case UAC_FEATURE_UNIT: { case UAC_FEATURE_UNIT: {