Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 361617
b: refs/heads/master
c: 4d7b86c
h: refs/heads/master
i:
  361615: 4bbc9a7
v: v3
  • Loading branch information
Daniel Mack authored and Takashi Iwai committed Mar 20, 2013
1 parent 803ee8e commit cbcc713
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 61ac51301e6c6d4ed977d7674ce2b8e713619a9b
refs/heads/master: 4d7b86c98e445b075c2c4c3757eb6d3d6efbe72e
10 changes: 6 additions & 4 deletions trunk/sound/usb/mixer.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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 */
Expand Down

0 comments on commit cbcc713

Please sign in to comment.