Merge commit 'upstream/master'

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/mn10300/kernel/mn10300-serial.c b/arch/mn10300/kernel/mn10300-serial.c
index b9c268c6b2fb..8b054e7a8ae8 100644
--- a/arch/mn10300/kernel/mn10300-serial.c
+++ b/arch/mn10300/kernel/mn10300-serial.c
@@ -392,7 +392,7 @@ static int mask_test_and_clear(volatile u8 *ptr, u8 mask)
 static void mn10300_serial_receive_interrupt(struct mn10300_serial_port *port)
 {
         struct uart_icount *icount = &port->uart.icount;
-        struct tty_struct *tty = port->uart.info->tty;
+        struct tty_struct *tty = port->uart.info->port.tty;
         unsigned ix;
         int count;
         u8 st, ch, push, status, overrun;