diff --git a/[refs] b/[refs]
index 72a8c63f4787..01830e6cd2c9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e32d82bcdb78f502f58d0b078395ed3864aaa223
+refs/heads/master: 333396fc703860e19eadcdc67def9caa4f3154f4
diff --git a/trunk/drivers/usb/serial/opticon.c b/trunk/drivers/usb/serial/opticon.c
index 2c9137c95730..543d8c79b026 100644
--- a/trunk/drivers/usb/serial/opticon.c
+++ b/trunk/drivers/usb/serial/opticon.c
@@ -492,7 +492,7 @@ static int opticon_port_probe(struct usb_serial_port *port)
 	if (!priv->bulk_read_urb)
 		goto error;
 
-	priv->buffer_size = 2 * port->bulk_in_size;
+	priv->buffer_size = port->bulk_in_size;
 	priv->bulk_in_buffer = kmalloc(priv->buffer_size, GFP_KERNEL);
 	if (!priv->bulk_in_buffer)
 		goto error;
@@ -559,6 +559,7 @@ static struct usb_serial_driver opticon_device = {
 	},
 	.id_table =		id_table,
 	.num_ports =		1,
+	.bulk_in_size =		256,
 	.attach =		opticon_startup,
 	.port_probe =		opticon_port_probe,
 	.port_remove =		opticon_port_remove,