[alsa-devel] [PATCH 1/3] ALSA: snd-usb: Accept UAC2 FORMAT_TYPE descriptors with bLength > 6

[Daniel Mack]

On Thu, Aug 4, 2011 at 4:07 PM, Takashi Iwai <tiwai at suse.de> wrote:
> At Thu,  4 Aug 2011 15:56:26 +0200,
> Daniel Mack wrote:
>>
>> 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 at gmail.com>
>> Reported-by: Nicolai Krakowiak <nicolai.krakowiak at gmail.com>
>> Cc: stable at kernel.org
>> ---
>>  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 1eea7e3..1867bbd 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 (protocol %d, bLength %d)\n",
>>                                  dev->devnum, iface_no, altno, protocol, fmt->bLength);
>>                       continue;
>
> This patch isn't applicable to sound git tree.  Any missing patch?

Eh, yes, sorry. Had it in my tree but did consider it important
enought to push right now. It's attached.

Thanks,
Daniel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-ALSA-snd-usb-be-more-verbose-about-bogus-UAC_FORMAT_.patch
Type: application/octet-stream
Size: 1036 bytes
Desc: not available
Url : http://mailman.alsa-project.org/pipermail/alsa-devel/attachments/20110804/72dfc974/attachment.dll