diff options
| author | Clemens Ladisch <clemens@ladisch.de> | 2011-08-04 16:17:42 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-15 18:31:37 -0700 |
| commit | eb473dd5ad8785d35142966cdcd6896d8dff5a22 (patch) | |
| tree | 46518ce7e23c4a524dfbfce61963190874a1404c /sound | |
| parent | 3ddef47156a5b3a005c1536b8d64ea6edff133aa (diff) | |
ALSA: snd-usb: Accept UAC2 FORMAT_TYPE descriptors with bLength > 6
commit 824818b148db42173446707df4cbd61cd7133272 upstream.
The Focusrite Scarlett 18i6 USB has them that way, which is probably a
bug. Anyway, the driver should simply ignore this fact.
Signed-off-by: Daniel Mack <zonque@gmail.com>
Reported-by: Nicolai Krakowiak <nicolai.krakowiak@gmail.com>
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/usb/endpoint.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c index b0ef9f50189..05842c8b067 100644 --- a/sound/usb/endpoint.c +++ b/sound/usb/endpoint.c @@ -352,7 +352,7 @@ int snd_usb_parse_audio_endpoints(struct snd_usb_audio *chip, int iface_no) continue; } if (((protocol == UAC_VERSION_1) && (fmt->bLength < 8)) || - ((protocol == UAC_VERSION_2) && (fmt->bLength != 6))) { + ((protocol == UAC_VERSION_2) && (fmt->bLength < 6))) { snd_printk(KERN_ERR "%d:%u:%d : invalid UAC_FORMAT_TYPE desc\n", dev->devnum, iface_no, altno); continue; |