revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36

[firefly-linux-kernel-4.4.55.git] / drivers / usb / serial / opticon.c

diff --git a/drivers/usb/serial/opticon.c b/drivers/usb/serial/opticon.c
index 9ff19c8a122eeb39d452b21c7c1dc33cc58f7cf9..ed01f3b2de8c037675667cedabf19040fa81c876 100644 (file)
--- a/drivers/usb/serial/opticon.c
+++ b/drivers/usb/serial/opticon.c
@@ -96,8 +96,8 @@ static void opticon_bulk_callback(struct urb *urb)
                        /* real data, send it to the tty layer */
                        tty = tty_port_tty_get(&port->port);
                        if (tty) {
-                               tty_insert_flip_string(tty, data + 2,
-                                                      data_length);
+                               tty_insert_flip_string(tty, data,
+                                                              data_length);
                                tty_flip_buffer_push(tty);
                                tty_kref_put(tty);
                        }
@@ -130,7 +130,7 @@ exit:
                                                  priv->bulk_address),
                                  priv->bulk_in_buffer, priv->buffer_size,
                                  opticon_bulk_callback, priv);
-               result = usb_submit_urb(priv->bulk_read_urb, GFP_ATOMIC);
+               result = usb_submit_urb(port->read_urb, GFP_ATOMIC);
                if (result)
                        dev_err(&port->dev,
                            "%s - failed resubmitting read urb, error %d\n",