Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 824818b1 authored by Clemens Ladisch's avatar Clemens Ladisch Committed by Takashi Iwai
Browse files

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: default avatarDaniel Mack <zonque@gmail.com>
Reported-by: default avatarNicolai Krakowiak <nicolai.krakowiak@gmail.com>
Cc: stable@kernel.org
Signed-off-by: default avatarClemens Ladisch <clemens@ladisch.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 2921623f

sound/usb/endpoint.c

+1 −1
Original line number Diff line number Diff line
@@ -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;