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

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

diff --git a/drivers/usb/serial/navman.c b/drivers/usb/serial/navman.c
index 1566f8f500ae673d65f9e62fdd3142a778d753ad..38725fc8c2c8b7c4c6be2ab130c31c55abb3ac78 100644 (file)
--- a/drivers/usb/serial/navman.c
+++ b/drivers/usb/serial/navman.c
@@ -32,7 +32,6 @@ static void navman_read_int_callback(struct urb *urb)
 {
        struct usb_serial_port *port = urb->context;
        unsigned char *data = urb->transfer_buffer;
-       struct tty_struct *tty;
        int status = urb->status;
        int result;
 
@@ -55,12 +54,10 @@ static void navman_read_int_callback(struct urb *urb)
 
        usb_serial_debug_data(&port->dev, __func__, urb->actual_length, data);
 
-       tty = tty_port_tty_get(&port->port);
-       if (tty && urb->actual_length) {
-               tty_insert_flip_string(tty, data, urb->actual_length);
-               tty_flip_buffer_push(tty);
+       if (urb->actual_length) {
+               tty_insert_flip_string(&port->port, data, urb->actual_length);
+               tty_flip_buffer_push(&port->port);
        }
-       tty_kref_put(tty);
 
 exit:
        result = usb_submit_urb(urb, GFP_ATOMIC);