USB: opticon: Fix long-standing bugs in opticon driver

commit 97cd8dc4ca9a1a5efb2cc38758e01492e3b013e2 upstream.

The bulk-read callback had two bugs:
a) The bulk-in packet's leading two zeros were returned (and the two last
   bytes truncated)
b) The wrong URB was transmitted for the second (and later) read requests,
   causing further reads to return the entire packet (including leading
   zeros)

Signed-off-by: Alon Ziv <alon-git@nolaviz.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/usb/serial/opticon.c b/drivers/usb/serial/opticon.c
index 4cdb975caa89a96a897451ba57203e97968a7bdc..656352a7e7ee274d13e24957b74ee9ce62247bb3 100644 (file)
--- a/drivers/usb/serial/opticon.c
+++ b/drivers/usb/serial/opticon.c
@@ -99,8 +99,8 @@ static void opticon_bulk_callback(struct urb *urb)
                                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",