1 files changed, 7 insertions, 14 deletions

diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index ba68835d06a6..eaa038d032b8 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -1960,9 +1960,8 @@ static int ftdi_prepare_write_buffer(struct usb_serial_port *port,
 
 #define FTDI_RS_ERR_MASK (FTDI_RS_BI | FTDI_RS_PE | FTDI_RS_FE | FTDI_RS_OE)
 
-static int ftdi_process_packet(struct tty_struct *tty,
-                struct usb_serial_port *port, struct ftdi_private *priv,
-                char *packet, int len)
+static int ftdi_process_packet(struct usb_serial_port *port,
+                struct ftdi_private *priv, char *packet, int len)
 {
         int i;
         char status;
@@ -2012,7 +2011,7 @@ static int ftdi_process_packet(struct tty_struct *tty,
                 /* Overrun is special, not associated with a char */
                 if (packet[1] & FTDI_RS_OE) {
                         priv->icount.overrun++;
-                        tty_insert_flip_char(tty, 0, TTY_OVERRUN);
+                        tty_insert_flip_char(&port->port, 0, TTY_OVERRUN);
                 }
         }
 
@@ -2031,10 +2030,10 @@ static int ftdi_process_packet(struct tty_struct *tty,
         if (port->port.console && port->sysrq) {
                 for (i = 0; i < len; i++, ch++) {
                         if (!usb_serial_handle_sysrq_char(port, *ch))
-                                tty_insert_flip_char(tty, *ch, flag);
+                                tty_insert_flip_char(&port->port, *ch, flag);
                 }
         } else {
-                tty_insert_flip_string_fixed_flag(tty, ch, flag, len);
+                tty_insert_flip_string_fixed_flag(&port->port, ch, flag, len);
         }
 
         return len;
@@ -2043,25 +2042,19 @@ static int ftdi_process_packet(struct tty_struct *tty,
 static void ftdi_process_read_urb(struct urb *urb)
 {
         struct usb_serial_port *port = urb->context;
-        struct tty_struct *tty;
         struct ftdi_private *priv = usb_get_serial_port_data(port);
         char *data = (char *)urb->transfer_buffer;
         int i;
         int len;
         int count = 0;
 
-        tty = tty_port_tty_get(&port->port);
-        if (!tty)
-                return;
-
         for (i = 0; i < urb->actual_length; i += priv->max_packet_size) {
                 len = min_t(int, urb->actual_length - i, priv->max_packet_size);
-                count += ftdi_process_packet(tty, port, priv, &data[i], len);
+                count += ftdi_process_packet(port, priv, &data[i], len);
         }
 
         if (count)
-                tty_flip_buffer_push(tty);
-        tty_kref_put(tty);
+                tty_flip_buffer_push(&port->port);
 }
 
 static void ftdi_break_ctl(struct tty_struct *tty, int break_state)