add generic patchset levelled up to 2.6.31-rc6
[openwrt/staging/dedeckeh.git] / target / linux / generic-2.6 / patches-2.6.31 / 801-usb_serial_endpoint_size.patch
1 --- a/drivers/usb/serial/usb-serial.c
2 +++ b/drivers/usb/serial/usb-serial.c
3 @@ -62,6 +62,7 @@ static struct usb_driver usb_serial_driv
4 drivers depend on it.
5 */
6
7 +static ushort maxSize = 0;
8 static int debug;
9 /* initially all NULL */
10 static struct usb_serial *serial_table[SERIAL_TTY_MINORS];
11 @@ -946,7 +947,7 @@ int usb_serial_probe(struct usb_interfac
12 dev_err(&interface->dev, "No free urbs available\n");
13 goto probe_error;
14 }
15 - buffer_size = le16_to_cpu(endpoint->wMaxPacketSize);
16 + buffer_size = (endpoint->wMaxPacketSize > maxSize) ? endpoint->wMaxPacketSize : maxSize;
17 port->bulk_in_size = buffer_size;
18 port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
19 port->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL);
20 @@ -1416,3 +1417,5 @@ MODULE_LICENSE("GPL");
21
22 module_param(debug, bool, S_IRUGO | S_IWUSR);
23 MODULE_PARM_DESC(debug, "Debug enabled or not");
24 +module_param(maxSize, ushort,0);
25 +MODULE_PARM_DESC(maxSize,"User specified USB endpoint size");