Skip to content

Commit

Permalink
serial: bcm63xx_uart: fix compilation after "TTY: switch tty_insert_f…
Browse files Browse the repository at this point in the history
…lip_char"

92a19f9 introduced a local variable
with the same name as the argument to bcm_uart_do_rx, breaking
compilation. Fix this by renaming the new variable and its uses where
expected.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>
Acked-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Jonas Gorski authored and Greg Kroah-Hartman committed Mar 12, 2013
1 parent 8d2f8cd commit 064256f
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/tty/serial/bcm63xx_uart.c
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ static const char *bcm_uart_type(struct uart_port *port)
*/
static void bcm_uart_do_rx(struct uart_port *port)
{
struct tty_port *port = &port->state->port;
struct tty_port *tty_port = &port->state->port;
unsigned int max_count;

/* limit number of char read in interrupt, should not be
Expand All @@ -260,7 +260,7 @@ static void bcm_uart_do_rx(struct uart_port *port)
bcm_uart_writel(port, val, UART_CTL_REG);

port->icount.overrun++;
tty_insert_flip_char(port, 0, TTY_OVERRUN);
tty_insert_flip_char(tty_port, 0, TTY_OVERRUN);
}

if (!(iestat & UART_IR_STAT(UART_IR_RXNOTEMPTY)))
Expand Down Expand Up @@ -299,11 +299,11 @@ static void bcm_uart_do_rx(struct uart_port *port)


if ((cstat & port->ignore_status_mask) == 0)
tty_insert_flip_char(port, c, flag);
tty_insert_flip_char(tty_port, c, flag);

} while (--max_count);

tty_flip_buffer_push(port);
tty_flip_buffer_push(tty_port);
}

/*
Expand Down

0 comments on commit 064256f

Please sign in to comment.