Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 064256fe authored by Jonas Gorski's avatar Jonas Gorski Committed by Greg Kroah-Hartman
Browse files

serial: bcm63xx_uart: fix compilation after "TTY: switch tty_insert_flip_char" 



92a19f9c 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: default avatarJonas Gorski <jogo@openwrt.org>
Acked-by: default avatarJiri Slaby <jslaby@suse.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8d2f8cd4

drivers/tty/serial/bcm63xx_uart.c

+4 −4
Original line number Diff line number Diff line
@@ -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
@@ -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)))
@@ -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);

}



/*