1 files changed, 11 insertions, 26 deletions

diff --git a/drivers/tty/nozomi.c b/drivers/tty/nozomi.c
index a0c69ab04399..2dff19796157 100644
--- a/drivers/tty/nozomi.c
+++ b/drivers/tty/nozomi.c
@@ -827,15 +827,10 @@ static int receive_data(enum port_type index, struct nozomi *dc)
         struct tty_struct *tty = tty_port_tty_get(&port->port);
         int i, ret;
 
-        if (unlikely(!tty)) {
-                DBG1("tty not open for port: %d?", index);
-                return 1;
-        }
-
         read_mem32((u32 *) &size, addr, 4);
         /*  DBG1( "%d bytes port: %d", size, index); */
 
-        if (test_bit(TTY_THROTTLED, &tty->flags)) {
+        if (tty && test_bit(TTY_THROTTLED, &tty->flags)) {
                 DBG1("No room in tty, don't read data, don't ack interrupt, "
                         "disable interrupt");
 
@@ -855,13 +850,14 @@ static int receive_data(enum port_type index, struct nozomi *dc)
                 read_mem32((u32 *) buf, addr + offset, RECEIVE_BUF_MAX);
 
                 if (size == 1) {
-                        tty_insert_flip_char(tty, buf[0], TTY_NORMAL);
+                        tty_insert_flip_char(&port->port, buf[0], TTY_NORMAL);
                         size = 0;
                 } else if (size < RECEIVE_BUF_MAX) {
-                        size -= tty_insert_flip_string(tty, (char *) buf, size);
+                        size -= tty_insert_flip_string(&port->port,
+                                        (char *)buf, size);
                 } else {
-                        i = tty_insert_flip_string(tty, \
-                                                (char *) buf, RECEIVE_BUF_MAX);
+                        i = tty_insert_flip_string(&port->port,
+                                        (char *)buf, RECEIVE_BUF_MAX);
                         size -= i;
                         offset += i;
                 }
@@ -1276,15 +1272,11 @@ static irqreturn_t interrupt_handler(int irq, void *dev_id)
 
 exit_handler:
         spin_unlock(&dc->spin_mutex);
-        for (a = 0; a < NOZOMI_MAX_PORTS; a++) {
-                struct tty_struct *tty;
-                if (test_and_clear_bit(a, &dc->flip)) {
-                        tty = tty_port_tty_get(&dc->port[a].port);
-                        if (tty)
-                                tty_flip_buffer_push(tty);
-                        tty_kref_put(tty);
-                }
-        }
+
+        for (a = 0; a < NOZOMI_MAX_PORTS; a++)
+                if (test_and_clear_bit(a, &dc->flip))
+                        tty_flip_buffer_push(&dc->port[a].port);
+
         return IRQ_HANDLED;
 none:
         spin_unlock(&dc->spin_mutex);
@@ -1687,12 +1679,6 @@ static int ntty_write(struct tty_struct *tty, const unsigned char *buffer,
 
         rval = kfifo_in(&port->fifo_ul, (unsigned char *)buffer, count);
 
-        /* notify card */
-        if (unlikely(dc == NULL)) {
-                DBG1("No device context?");
-                goto exit;
-        }
-
         spin_lock_irqsave(&dc->spin_mutex, flags);
         /* CTS is only valid on the modem channel */
         if (port == &(dc->port[PORT_MDM])) {
@@ -1708,7 +1694,6 @@ static int ntty_write(struct tty_struct *tty, const unsigned char *buffer,
         }
         spin_unlock_irqrestore(&dc->spin_mutex, flags);
 
-exit:
         return rval;
 }