|
|
|
@ -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");
|
|
|
|
|