Skip to content

Commit

Permalink
ALSA: usb-audio: Fix implicit fb endpoint setup by quirk
Browse files Browse the repository at this point in the history
The commit a60945f ("ALSA: usb-audio: move implicit fb quirks to
separate function") introduced an error in the handling of quirks for
implicit feedback endpoints. This commit fixes this.

If a quirk successfully sets up an implicit feedback endpoint, usb-audio
no longer tries to find the implicit fb endpoint itself.

Fixes: a60945f ("ALSA: usb-audio: move implicit fb quirks to separate function")
Signed-off-by: Manuel Reinhardt <manuel.rhdt@gmail.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Manuel Reinhardt authored and Takashi Iwai committed Feb 7, 2019
1 parent 4cd3016 commit 2bc16b9
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion sound/usb/pcm.c
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,9 @@ static int search_roland_implicit_fb(struct usb_device *dev, int ifnum,
return 0;
}

/* Setup an implicit feedback endpoint from a quirk. Returns 0 if no quirk
* applies. Returns 1 if a quirk was found.
*/
static int set_sync_ep_implicit_fb_quirk(struct snd_usb_substream *subs,
struct usb_device *dev,
struct usb_interface_descriptor *altsd,
Expand Down Expand Up @@ -384,7 +387,7 @@ static int set_sync_ep_implicit_fb_quirk(struct snd_usb_substream *subs,

subs->data_endpoint->sync_master = subs->sync_endpoint;

return 0;
return 1;
}

static int set_sync_endpoint(struct snd_usb_substream *subs,
Expand Down Expand Up @@ -423,6 +426,10 @@ static int set_sync_endpoint(struct snd_usb_substream *subs,
if (err < 0)
return err;

/* endpoint set by quirk */
if (err > 0)
return 0;

if (altsd->bNumEndpoints < 2)
return 0;

Expand Down

0 comments on commit 2bc16b9

Please sign in to comment.