Merge branch 'master' into for-next

[can-eth-gw-linux.git] / drivers / tty / serial / bfin_uart.c

diff --git a/drivers/tty/serial/bfin_uart.c b/drivers/tty/serial/bfin_uart.c
index 58913eecefe5b1611b01df36fc2cf629a9fa38bb..9b11c3f23eae98fcfad2c97f9983ef5b91928ac1 100644 (file)
--- a/drivers/tty/serial/bfin_uart.c
+++ b/drivers/tty/serial/bfin_uart.c
@@ -182,7 +182,7 @@ static void bfin_serial_start_tx(struct uart_port *port)
         * To avoid losting RX interrupt, we reset IR function
         * before sending data.
         */
-       if (tty->termios->c_line == N_IRDA)
+       if (tty->termios.c_line == N_IRDA)
                bfin_serial_reset_irda(port);
 
 #ifdef CONFIG_SERIAL_BFIN_DMA