diff options
Diffstat (limited to 'drivers/tty/serial/ucc_uart.c')
-rw-r--r-- | drivers/tty/serial/ucc_uart.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/tty/serial/ucc_uart.c b/drivers/tty/serial/ucc_uart.c index f99b0c965f85..7355303dad99 100644 --- a/drivers/tty/serial/ucc_uart.c +++ b/drivers/tty/serial/ucc_uart.c | |||
@@ -469,7 +469,7 @@ static void qe_uart_int_rx(struct uart_qe_port *qe_port) | |||
469 | int i; | 469 | int i; |
470 | unsigned char ch, *cp; | 470 | unsigned char ch, *cp; |
471 | struct uart_port *port = &qe_port->port; | 471 | struct uart_port *port = &qe_port->port; |
472 | struct tty_struct *tty = port->state->port.tty; | 472 | struct tty_port *tport = &port->state->port; |
473 | struct qe_bd *bdp; | 473 | struct qe_bd *bdp; |
474 | u16 status; | 474 | u16 status; |
475 | unsigned int flg; | 475 | unsigned int flg; |
@@ -491,7 +491,7 @@ static void qe_uart_int_rx(struct uart_qe_port *qe_port) | |||
491 | /* If we don't have enough room in RX buffer for the entire BD, | 491 | /* If we don't have enough room in RX buffer for the entire BD, |
492 | * then we try later, which will be the next RX interrupt. | 492 | * then we try later, which will be the next RX interrupt. |
493 | */ | 493 | */ |
494 | if (tty_buffer_request_room(tty, i) < i) { | 494 | if (tty_buffer_request_room(tport, i) < i) { |
495 | dev_dbg(port->dev, "ucc-uart: no room in RX buffer\n"); | 495 | dev_dbg(port->dev, "ucc-uart: no room in RX buffer\n"); |
496 | return; | 496 | return; |
497 | } | 497 | } |
@@ -512,7 +512,7 @@ static void qe_uart_int_rx(struct uart_qe_port *qe_port) | |||
512 | continue; | 512 | continue; |
513 | 513 | ||
514 | error_return: | 514 | error_return: |
515 | tty_insert_flip_char(tty, ch, flg); | 515 | tty_insert_flip_char(tport, ch, flg); |
516 | 516 | ||
517 | } | 517 | } |
518 | 518 | ||
@@ -530,7 +530,7 @@ error_return: | |||
530 | qe_port->rx_cur = bdp; | 530 | qe_port->rx_cur = bdp; |
531 | 531 | ||
532 | /* Activate BH processing */ | 532 | /* Activate BH processing */ |
533 | tty_flip_buffer_push(tty); | 533 | tty_flip_buffer_push(tport); |
534 | 534 | ||
535 | return; | 535 | return; |
536 | 536 | ||
@@ -560,7 +560,7 @@ handle_error: | |||
560 | 560 | ||
561 | /* Overrun does not affect the current character ! */ | 561 | /* Overrun does not affect the current character ! */ |
562 | if (status & BD_SC_OV) | 562 | if (status & BD_SC_OV) |
563 | tty_insert_flip_char(tty, 0, TTY_OVERRUN); | 563 | tty_insert_flip_char(tport, 0, TTY_OVERRUN); |
564 | #ifdef SUPPORT_SYSRQ | 564 | #ifdef SUPPORT_SYSRQ |
565 | port->sysrq = 0; | 565 | port->sysrq = 0; |
566 | #endif | 566 | #endif |