Merge tag 'for-3.9-rc1' of git://gitorious.org/linux-pwm/linux-pwm

[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 c6bfb83efb1e5b988afa71e1fbcbeaa264101237..e13e1a4d3e1e0901d09195280ae6f7fd4cf386fc 100644 (file)
--- a/drivers/usb/serial/opticon.c
+++ b/drivers/usb/serial/opticon.c
@@ -51,15 +51,8 @@ struct opticon_private {
 static void opticon_process_data_packet(struct usb_serial_port *port,
                                        const unsigned char *buf, size_t len)
 {
-       struct tty_struct *tty;
-
-       tty = tty_port_tty_get(&port->port);
-       if (!tty)
-               return;
-
-       tty_insert_flip_string(tty, buf, len);
-       tty_flip_buffer_push(tty);
-       tty_kref_put(tty);
+       tty_insert_flip_string(&port->port, buf, len);
+       tty_flip_buffer_push(&port->port);
 }
 
 static void opticon_process_status_packet(struct usb_serial_port *port,