From: Maxime Bizon <mbizon@xxxxxxxxxx> The driver missed an API change. Signed-off-by: Maxime Bizon <mbizon@xxxxxxxxxx> Cc: linux-mips@xxxxxxxxxxxxxx Cc: linux-serial@xxxxxxxxxxxxxxx Cc: linux-kernel@xxxxxxxxxxxxxxx Signed-off-by: Ralf Baechle <ralf@xxxxxxxxxxxxxx> drivers/serial/bcm63xx_uart.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: upstream-linus/drivers/serial/bcm63xx_uart.c =================================================================== --- upstream-linus.orig/drivers/serial/bcm63xx_uart.c +++ upstream-linus/drivers/serial/bcm63xx_uart.c @@ -242,7 +242,7 @@ static void bcm_uart_do_rx(struct uart_p * higher than fifo size anyway since we're much faster than * serial port */ max_count = 32; - tty = port->info->port.tty; + tty = port->state->port.tty; do { unsigned int iestat, c, cstat; char flag; @@ -318,7 +318,7 @@ static void bcm_uart_do_tx(struct uart_p return; } - xmit = &port->info->xmit; + xmit = &port->state->xmit; if (uart_circ_empty(xmit)) goto txq_empty;