This is a note to let you know that I've just added the patch titled

    ALSA: snd-usb: Accept UAC2 FORMAT_TYPE descriptors with

to the 3.0-stable tree which can be found at:
    
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     alsa-snd-usb-accept-uac2-format_type-descriptors-with.patch
and it can be found in the queue-3.0 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <sta...@kernel.org> know about it.


>From 824818b148db42173446707df4cbd61cd7133272 Mon Sep 17 00:00:00 2001
From: Clemens Ladisch <clem...@ladisch.de>
Date: Thu, 4 Aug 2011 16:17:42 +0200
Subject: ALSA: snd-usb: Accept UAC2 FORMAT_TYPE descriptors with
 bLength > 6

From: Clemens Ladisch <clem...@ladisch.de>

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 <zon...@gmail.com>
Reported-by: Nicolai Krakowiak <nicolai.krakow...@gmail.com>
Signed-off-by: Clemens Ladisch <clem...@ladisch.de>
Signed-off-by: Takashi Iwai <ti...@suse.de>
Signed-off-by: Greg Kroah-Hartman <gre...@suse.de>

---
 sound/usb/endpoint.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/sound/usb/endpoint.c
+++ b/sound/usb/endpoint.c
@@ -352,7 +352,7 @@ int snd_usb_parse_audio_endpoints(struct
                        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;


Patches currently in stable-queue which might be from clem...@ladisch.de are

queue-3.0/alsa-snd-usb-operate-on-given-mixer-interface-only.patch
queue-3.0/alsa-snd-usb-accept-uac2-format_type-descriptors-with.patch
queue-3.0/alsa-snd-usb-avoid-dividing-by-zero-on-invalid-input.patch

_______________________________________________
stable mailing list
stable@linux.kernel.org
http://linux.kernel.org/mailman/listinfo/stable

Reply via email to