Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 824818b148db42173446707df4cbd61cd7133272

Authored by Clemens Ladisch
Committed by Takashi Iwai
1 parent 2921623f71
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

ALSA: snd-usb: Accept UAC2 FORMAT_TYPE descriptors with bLength > 6 

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>
Cc: stable@kernel.org
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

sound/usb/endpoint.c
Diff comments   View file @ 824818b
... ... @@ -352,7 +352,7 @@
352 352 continue;
353 353 }
354 354 if (((protocol == UAC_VERSION_1) && (fmt->bLength < 8)) ||
355   - ((protocol == UAC_VERSION_2) && (fmt->bLength != 6))) {
  355 + ((protocol == UAC_VERSION_2) && (fmt->bLength < 6))) {
356 356 snd_printk(KERN_ERR "%d:%u:%d : invalid UAC_FORMAT_TYPE desc\n",
357 357 dev->devnum, iface_no, altno);
358 358 continue;