diff options
Diffstat (limited to 'drivers/tty/serial/mpc52xx_uart.c')
-rw-r--r-- | drivers/tty/serial/mpc52xx_uart.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/tty/serial/mpc52xx_uart.c b/drivers/tty/serial/mpc52xx_uart.c index 7c23c4f4c58d..c0e1fad51be7 100644 --- a/drivers/tty/serial/mpc52xx_uart.c +++ b/drivers/tty/serial/mpc52xx_uart.c | |||
@@ -941,7 +941,7 @@ static struct uart_ops mpc52xx_uart_ops = { | |||
941 | static inline int | 941 | static inline int |
942 | mpc52xx_uart_int_rx_chars(struct uart_port *port) | 942 | mpc52xx_uart_int_rx_chars(struct uart_port *port) |
943 | { | 943 | { |
944 | struct tty_struct *tty = port->state->port.tty; | 944 | struct tty_port *tport = &port->state->port; |
945 | unsigned char ch, flag; | 945 | unsigned char ch, flag; |
946 | unsigned short status; | 946 | unsigned short status; |
947 | 947 | ||
@@ -986,20 +986,20 @@ mpc52xx_uart_int_rx_chars(struct uart_port *port) | |||
986 | out_8(&PSC(port)->command, MPC52xx_PSC_RST_ERR_STAT); | 986 | out_8(&PSC(port)->command, MPC52xx_PSC_RST_ERR_STAT); |
987 | 987 | ||
988 | } | 988 | } |
989 | tty_insert_flip_char(tty, ch, flag); | 989 | tty_insert_flip_char(tport, ch, flag); |
990 | if (status & MPC52xx_PSC_SR_OE) { | 990 | if (status & MPC52xx_PSC_SR_OE) { |
991 | /* | 991 | /* |
992 | * Overrun is special, since it's | 992 | * Overrun is special, since it's |
993 | * reported immediately, and doesn't | 993 | * reported immediately, and doesn't |
994 | * affect the current character | 994 | * affect the current character |
995 | */ | 995 | */ |
996 | tty_insert_flip_char(tty, 0, TTY_OVERRUN); | 996 | tty_insert_flip_char(tport, 0, TTY_OVERRUN); |
997 | port->icount.overrun++; | 997 | port->icount.overrun++; |
998 | } | 998 | } |
999 | } | 999 | } |
1000 | 1000 | ||
1001 | spin_unlock(&port->lock); | 1001 | spin_unlock(&port->lock); |
1002 | tty_flip_buffer_push(tty); | 1002 | tty_flip_buffer_push(tport); |
1003 | spin_lock(&port->lock); | 1003 | spin_lock(&port->lock); |
1004 | 1004 | ||
1005 | return psc_ops->raw_rx_rdy(port); | 1005 | return psc_ops->raw_rx_rdy(port); |