1 files changed, 8 insertions, 0 deletions

diff --git a/sound/usb/stream.c b/sound/usb/stream.c
index 8951f77a7201..7db2f8958e79 100644
--- a/sound/usb/stream.c
+++ b/sound/usb/stream.c
@@ -393,6 +393,14 @@ static int parse_uac_endpoint_attributes(struct snd_usb_audio *chip,
         if (!csep && altsd->bNumEndpoints >= 2)
                 csep = snd_usb_find_desc(alts->endpoint[1].extra, alts->endpoint[1].extralen, NULL, USB_DT_CS_ENDPOINT);
 
+        /*
+         * If we can't locate the USB_DT_CS_ENDPOINT descriptor in the extra
+         * bytes after the first endpoint, go search the entire interface.
+         * Some devices have it directly *before* the standard endpoint.
+         */
+        if (!csep)
+                csep = snd_usb_find_desc(alts->extra, alts->extralen, NULL, USB_DT_CS_ENDPOINT);
+
         if (!csep || csep->bLength < 7 ||
             csep->bDescriptorSubtype != UAC_EP_GENERAL) {
                 snd_printk(KERN_WARNING "%d:%u:%d : no or invalid"