diff --git a/[refs] b/[refs] index e7cf83c27484..6f63b5d59f83 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bdb595b4a906b8124d0dc5ff852f84302e2e7955 +refs/heads/master: 55e4b8b416849753bd7eacd1f2ac3947fcf1c78e diff --git a/trunk/drivers/tty/serial/serial_core.c b/trunk/drivers/tty/serial/serial_core.c index a21dc8e3b7c0..246b823c1b27 100644 --- a/trunk/drivers/tty/serial/serial_core.c +++ b/trunk/drivers/tty/serial/serial_core.c @@ -2527,16 +2527,14 @@ void uart_insert_char(struct uart_port *port, unsigned int status, struct tty_struct *tty = port->state->port.tty; if ((status & port->ignore_status_mask & ~overrun) == 0) - if (tty_insert_flip_char(tty, ch, flag) == 0) - ++port->icount.buf_overrun; + tty_insert_flip_char(tty, ch, flag); /* * Overrun is special. Since it's reported immediately, * it doesn't affect the current character. */ if (status & ~port->ignore_status_mask & overrun) - if (tty_insert_flip_char(tty, 0, TTY_OVERRUN) == 0) - ++port->icount.buf_overrun; + tty_insert_flip_char(tty, 0, TTY_OVERRUN); } EXPORT_SYMBOL_GPL(uart_insert_char);