mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-28 07:13:34 +00:00
ALSA: usb-audio: Fix implicit fb endpoint setup by quirk
commit2bc16b9f32
upstream. The commita60945fd08
("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:a60945fd08
("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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
3ca538b799
commit
240f1d1a1c
1 changed files with 8 additions and 1 deletions
|
@ -313,6 +313,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,
|
||||
|
@ -391,7 +394,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,
|
||||
|
@ -430,6 +433,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;
|
||||
|
||||
|
|
Loading…
Reference in a new issue