diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2011-04-03 13:59:07 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2011-04-03 13:59:07 +0000 |
| commit | 5fb18eaef8bf75add7cb9c39d3929cf3b1ac57fd (patch) | |
| tree | 1056fb8cb600b3eb55cb097963ad6bcac46a1ac8 /target/linux/generic/patches-2.6.37/801-usb_serial_endpoint_size.patch | |
| parent | 84534f9fd57053df6fb4545c7c3262b5a2f17ed9 (diff) | |
| download | upstream-5fb18eaef8bf75add7cb9c39d3929cf3b1ac57fd.tar.gz upstream-5fb18eaef8bf75add7cb9c39d3929cf3b1ac57fd.tar.bz2 upstream-5fb18eaef8bf75add7cb9c39d3929cf3b1ac57fd.zip | |
kernel: Update to version 2.6.37.6
Thank you Peter Wagner for the patch
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26441 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.37/801-usb_serial_endpoint_size.patch')
| -rw-r--r-- | target/linux/generic/patches-2.6.37/801-usb_serial_endpoint_size.patch | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/target/linux/generic/patches-2.6.37/801-usb_serial_endpoint_size.patch b/target/linux/generic/patches-2.6.37/801-usb_serial_endpoint_size.patch index 3725b922ce..1646fdf1b1 100644 --- a/target/linux/generic/patches-2.6.37/801-usb_serial_endpoint_size.patch +++ b/target/linux/generic/patches-2.6.37/801-usb_serial_endpoint_size.patch @@ -8,16 +8,17 @@ static int debug; /* initially all NULL */ static struct usb_serial *serial_table[SERIAL_TTY_MINORS]; -@@ -913,7 +914,7 @@ int usb_serial_probe(struct usb_interfac +@@ -912,7 +913,8 @@ int usb_serial_probe(struct usb_interfac + goto probe_error; } - buffer_size = serial->type->bulk_in_size; - if (!buffer_size) -- buffer_size = le16_to_cpu(endpoint->wMaxPacketSize); -+ buffer_size = (endpoint->wMaxPacketSize > maxSize) ? endpoint->wMaxPacketSize : maxSize; + buffer_size = max_t(int, serial->type->bulk_in_size, +- le16_to_cpu(endpoint->wMaxPacketSize)); ++ max_t(int, le16_to_cpu(endpoint->wMaxPacketSize), ++ maxSize)); port->bulk_in_size = buffer_size; port->bulk_in_endpointAddress = endpoint->bEndpointAddress; port->bulk_in_buffer = kmalloc(buffer_size, GFP_KERNEL); -@@ -1392,3 +1393,5 @@ MODULE_LICENSE("GPL"); +@@ -1391,3 +1393,5 @@ MODULE_LICENSE("GPL"); module_param(debug, bool, S_IRUGO | S_IWUSR); MODULE_PARM_DESC(debug, "Debug enabled or not"); |