Merge 3.10-rc5 into usb-next

We need the changes in this branch.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 7 insertions, 3 deletions

diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
index 47ff9b1c8a37..05986507b585 100644
--- a/drivers/usb/core/devio.c
+++ b/drivers/usb/core/devio.c
@@ -1287,9 +1287,13 @@ static int proc_do_submiturb(struct dev_state *ps, struct usbdevfs_urb *uurb,
                         goto error;
                 }
                 for (totlen = u = 0; u < uurb->number_of_packets; u++) {
-                        /* arbitrary limit,
-                         * sufficient for USB 2.0 high-bandwidth iso */
-                        if (isopkt[u].length > 8192) {
+                        /*
+                         * arbitrary limit need for USB 3.0
+                         * bMaxBurst (0~15 allowed, 1~16 packets)
+                         * bmAttributes (bit 1:0, mult 0~2, 1~3 packets)
+                         * sizemax: 1024 * 16 * 3 = 49152
+                         */
+                        if (isopkt[u].length > 49152) {
                                 ret = -EINVAL;
                                 goto error;
                         }