From cbcc7137aedaafb3238d3e002dabe8689f1619d8 Mon Sep 17 00:00:00 2001 From: Daniel Mack Date: Tue, 19 Mar 2013 21:09:24 +0100 Subject: [PATCH] --- yaml --- r: 361617 b: refs/heads/master c: 4d7b86c98e445b075c2c4c3757eb6d3d6efbe72e h: refs/heads/master i: 361615: 4bbc9a79e6e46d8ea7caf24963a88b5329d54d31 v: v3 --- [refs] | 2 +- trunk/sound/usb/mixer.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f7ca3d830e8d..66d2d6d563c4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 61ac51301e6c6d4ed977d7674ce2b8e713619a9b +refs/heads/master: 4d7b86c98e445b075c2c4c3757eb6d3d6efbe72e diff --git a/trunk/sound/usb/mixer.c b/trunk/sound/usb/mixer.c index 8eb84c0f7bf1..45cc0aff9c3e 100644 --- a/trunk/sound/usb/mixer.c +++ b/trunk/sound/usb/mixer.c @@ -715,8 +715,9 @@ static int check_input_term(struct mixer_build *state, int id, struct usb_audio_ case UAC2_CLOCK_SELECTOR: { struct uac_selector_unit_descriptor *d = p1; /* call recursively to retrieve the channel info */ - if (check_input_term(state, d->baSourceID[0], term) < 0) - return -ENODEV; + err = check_input_term(state, d->baSourceID[0], term); + if (err < 0) + return err; term->type = d->bDescriptorSubtype << 16; /* virtual type */ term->id = id; term->name = uac_selector_unit_iSelector(d); @@ -1357,8 +1358,9 @@ static int parse_audio_feature_unit(struct mixer_build *state, int unitid, void return err; /* determine the input source type and name */ - if (check_input_term(state, hdr->bSourceID, &iterm) < 0) - return -EINVAL; + err = check_input_term(state, hdr->bSourceID, &iterm); + if (err < 0) + return err; master_bits = snd_usb_combine_bytes(bmaControls, csize); /* master configuration quirks */