aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLassi Ylikojola2018-02-09 08:51:36 -0600
committerGreg Kroah-Hartman2018-02-22 08:45:01 -0600
commit5e5d1372ba7cfa0cf040a4e038e689f6f16e6470 (patch)
tree6f71460fbfca5cb1697a52be4221c810e631b619
parentd84b8a33526b29d7e39ae2f6e8ce0e7d520fa5cd (diff)
downloadkernel-omap-5e5d1372ba7cfa0cf040a4e038e689f6f16e6470.tar.gz
kernel-omap-5e5d1372ba7cfa0cf040a4e038e689f6f16e6470.tar.xz
kernel-omap-5e5d1372ba7cfa0cf040a4e038e689f6f16e6470.zip
ALSA: usb-audio: add implicit fb quirk for Behringer UFX1204
commit 5e35dc0338d85ccebacf3f77eca1e5dea73155e8 upstream. Add quirk to ensure a sync endpoint is properly configured. This patch is a fix for same symptoms on Behringer UFX1204 as patch from Albertto Aquirre on Dec 8 2016 for Axe-Fx II. Signed-off-by: Lassi Ylikojola <lassi.ylikojola@gmail.com> Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--sound/usb/pcm.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c
index 48afae053c56..8e8db4ddf365 100644
--- a/sound/usb/pcm.c
+++ b/sound/usb/pcm.c
@@ -348,6 +348,15 @@ static int set_sync_ep_implicit_fb_quirk(struct snd_usb_substream *subs,
348 348
349 alts = &iface->altsetting[1]; 349 alts = &iface->altsetting[1];
350 goto add_sync_ep; 350 goto add_sync_ep;
351 case USB_ID(0x1397, 0x0002):
352 ep = 0x81;
353 iface = usb_ifnum_to_if(dev, 1);
354
355 if (!iface || iface->num_altsetting == 0)
356 return -EINVAL;
357
358 alts = &iface->altsetting[1];
359 goto add_sync_ep;
351 } 360 }
352 if (attr == USB_ENDPOINT_SYNC_ASYNC && 361 if (attr == USB_ENDPOINT_SYNC_ASYNC &&
353 altsd->bInterfaceClass == USB_CLASS_VENDOR_SPEC && 362 altsd->bInterfaceClass == USB_CLASS_VENDOR_SPEC &&