--- a/drivers/usb/serial/usbserial.c
+++ b/drivers/usb/serial/usbserial.c
@@ -331,6 +331,7 @@ static void generic_shutdown		(struct us
 #ifdef CONFIG_USB_SERIAL_GENERIC
 static __u16	vendor	= 0x05f9;
 static __u16	product	= 0xffff;
+static int	maxSize = 0;
 
 static struct usb_device_id generic_device_ids[2]; /* Initially all zeroes. */
 
@@ -1557,7 +1558,11 @@ static void * usb_serial_probe(struct us
 			err("No free urbs available");
 			goto probe_error;
 		}
+#ifdef CONFIG_USB_SERIAL_GENERIC
+		buffer_size = (endpoint->wMaxPacketSize > maxSize) ? endpoint->wMaxPacketSize : maxSize;
+#else
 		buffer_size = endpoint->wMaxPacketSize;
+#endif
 		port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
 		port->bulk_in_buffer = kmalloc (buffer_size, GFP_KERNEL);
 		if (!port->bulk_in_buffer) {
@@ -1921,4 +1926,7 @@ MODULE_PARM_DESC(vendor, "User specified
 
 MODULE_PARM(product, "h");
 MODULE_PARM_DESC(product, "User specified USB idProduct");
+
+MODULE_PARM(maxSize,"i");
+MODULE_PARM_DESC(maxSize,"User specified USB endpoint size");
 #endif