diff options
Diffstat (limited to 'drivers/tty/serial/m32r_sio.c')
-rw-r--r-- | drivers/tty/serial/m32r_sio.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/tty/serial/m32r_sio.c b/drivers/tty/serial/m32r_sio.c index b13949ad3408..bb1afa0922e1 100644 --- a/drivers/tty/serial/m32r_sio.c +++ b/drivers/tty/serial/m32r_sio.c | |||
@@ -300,7 +300,7 @@ static void m32r_sio_enable_ms(struct uart_port *port) | |||
300 | 300 | ||
301 | static void receive_chars(struct uart_sio_port *up, int *status) | 301 | static void receive_chars(struct uart_sio_port *up, int *status) |
302 | { | 302 | { |
303 | struct tty_struct *tty = up->port.state->port.tty; | 303 | struct tty_port *port = &up->port.state->port; |
304 | unsigned char ch; | 304 | unsigned char ch; |
305 | unsigned char flag; | 305 | unsigned char flag; |
306 | int max_count = 256; | 306 | int max_count = 256; |
@@ -355,7 +355,7 @@ static void receive_chars(struct uart_sio_port *up, int *status) | |||
355 | if (uart_handle_sysrq_char(&up->port, ch)) | 355 | if (uart_handle_sysrq_char(&up->port, ch)) |
356 | goto ignore_char; | 356 | goto ignore_char; |
357 | if ((*status & up->port.ignore_status_mask) == 0) | 357 | if ((*status & up->port.ignore_status_mask) == 0) |
358 | tty_insert_flip_char(tty, ch, flag); | 358 | tty_insert_flip_char(port, ch, flag); |
359 | 359 | ||
360 | if (*status & UART_LSR_OE) { | 360 | if (*status & UART_LSR_OE) { |
361 | /* | 361 | /* |
@@ -363,12 +363,12 @@ static void receive_chars(struct uart_sio_port *up, int *status) | |||
363 | * immediately, and doesn't affect the current | 363 | * immediately, and doesn't affect the current |
364 | * character. | 364 | * character. |
365 | */ | 365 | */ |
366 | tty_insert_flip_char(tty, 0, TTY_OVERRUN); | 366 | tty_insert_flip_char(port, 0, TTY_OVERRUN); |
367 | } | 367 | } |
368 | ignore_char: | 368 | ignore_char: |
369 | *status = serial_in(up, UART_LSR); | 369 | *status = serial_in(up, UART_LSR); |
370 | } while ((*status & UART_LSR_DR) && (max_count-- > 0)); | 370 | } while ((*status & UART_LSR_DR) && (max_count-- > 0)); |
371 | tty_flip_buffer_push(tty); | 371 | tty_flip_buffer_push(port); |
372 | } | 372 | } |
373 | 373 | ||
374 | static void transmit_chars(struct uart_sio_port *up) | 374 | static void transmit_chars(struct uart_sio_port *up) |