Updated to 2.6.32.27
/drivers/usb/serial/opticon.c
blob:80f59b6350cbdcee5a9864ef51990c51e2309ad4 -> blob:db7cf086604623c8d5b8b9aafea21d63e7e04170
--- drivers/usb/serial/opticon.c
+++ drivers/usb/serial/opticon.c
@@ -99,8 +99,8 @@ static void opticon_bulk_callback(struct
available_room = tty_buffer_request_room(tty,
data_length);
if (available_room) {
- tty_insert_flip_string(tty, data,
- available_room);
+ tty_insert_flip_string(tty, data + 2,
+ data_length);
tty_flip_buffer_push(tty);
}
tty_kref_put(tty);
@@ -134,7 +134,7 @@ exit:
priv->bulk_address),
priv->bulk_in_buffer, priv->buffer_size,
opticon_bulk_callback, priv);
- result = usb_submit_urb(port->read_urb, GFP_ATOMIC);
+ result = usb_submit_urb(priv->bulk_read_urb, GFP_ATOMIC);
if (result)
dev_err(&port->dev,
"%s - failed resubmitting read urb, error %d\n",