1 files changed, 6 insertions, 7 deletions

diff --git a/drivers/tty/amiserial.c b/drivers/tty/amiserial.c
index 9d7d00cdfecb..4c7d70172193 100644
--- a/drivers/tty/amiserial.c
+++ b/drivers/tty/amiserial.c
@@ -251,7 +251,6 @@ static void receive_chars(struct serial_state *info)
 {
         int status;
         int serdatr;
-        struct tty_struct *tty = info->tport.tty;
         unsigned char ch, flag;
         struct  async_icount *icount;
         int oe = 0;
@@ -314,7 +313,7 @@ static void receive_chars(struct serial_state *info)
 #endif
             flag = TTY_BREAK;
             if (info->tport.flags & ASYNC_SAK)
-              do_SAK(tty);
+              do_SAK(info->tport.tty);
           } else if (status & UART_LSR_PE)
             flag = TTY_PARITY;
           else if (status & UART_LSR_FE)
@@ -328,10 +327,10 @@ static void receive_chars(struct serial_state *info)
              oe = 1;
           }
         }
-        tty_insert_flip_char(tty, ch, flag);
+        tty_insert_flip_char(&info->tport, ch, flag);
         if (oe == 1)
-                tty_insert_flip_char(tty, 0, TTY_OVERRUN);
-        tty_flip_buffer_push(tty);
+                tty_insert_flip_char(&info->tport, 0, TTY_OVERRUN);
+        tty_flip_buffer_push(&info->tport);
 out:
         return;
 }
@@ -1099,7 +1098,7 @@ static int set_serial_info(struct tty_struct *tty, struct serial_state *state,
         state->custom_divisor = new_serial.custom_divisor;
         port->close_delay = new_serial.close_delay * HZ/100;
         port->closing_wait = new_serial.closing_wait * HZ/100;
-        tty->low_latency = (port->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
+        port->low_latency = (port->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
 
 check_and_exit:
         if (port->flags & ASYNC_INITIALIZED) {
@@ -1528,7 +1527,7 @@ static int rs_open(struct tty_struct *tty, struct file * filp)
         if (serial_paranoia_check(info, tty->name, "rs_open"))
                 return -ENODEV;
 
-        tty->low_latency = (port->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
+        port->low_latency = (port->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
 
         retval = startup(tty, info);
         if (retval) {