1 files changed, 3 insertions, 11 deletions
diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
index 9ab910370c56..82a3151e393c 100644
--- a/drivers/tty/serial/xilinx_uartps.c
+++ b/drivers/tty/serial/xilinx_uartps.c
@@ -147,15 +147,11 @@
 static irqreturn_t xuartps_isr(int irq, void *dev_id)
 {
        struct uart_port *port = (struct uart_port *)dev_id;
-        struct tty_struct *tty;
        unsigned long flags;
        unsigned int isrstatus, numbytes;
        unsigned int data;
        char status = TTY_NORMAL;
-        /* Get the tty which could be NULL so don't assume it's valid */
-        tty = tty_port_tty_get(&port->state->port);
        spin_lock_irqsave(&port->lock, flags);
        /* Read the interrupt status register to determine which
@@ -187,14 +183,11 @@ static irqreturn_t xuartps_isr(int irq, void *dev_id)
                        } else if (isrstatus & XUARTPS_IXR_OVERRUN)
                                port->icount.overrun++;
-                        if (tty)
+                        uart_insert_char(port, isrstatus, XUARTPS_IXR_OVERRUN,
-                                uart_insert_char(port, isrstatus,
+                                        data, status);
-                                                XUARTPS_IXR_OVERRUN, data,
-                                                status);
                }
                spin_unlock(&port->lock);
-                if (tty)
+                tty_flip_buffer_push(&port->state->port);
-                        tty_flip_buffer_push(tty);
                spin_lock(&port->lock);
        }
@@ -237,7 +230,6 @@ static irqreturn_t xuartps_isr(int irq, void *dev_id)
        /* be sure to release the lock and tty before leaving */
        spin_unlock_irqrestore(&port->lock, flags);
-        tty_kref_put(tty);
        return IRQ_HANDLED;
 }