Skip to content

Commit

Permalink
Revert "serial_core: Update buffer overrun statistics."
Browse files Browse the repository at this point in the history
This reverts commit 6421808.

Buffer overruns are for hardware reported overruns, not software ones,
which will only happen if we run out of memory and you will get lots of
-ENOMEM errors at the same time.

Thanks to Alan Cox for catching this.

Reported-by: Alan Cox <alan@linux.intel.com>
Cc: Corbin Atkinson <corbinat@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Greg Kroah-Hartman committed May 15, 2012
1 parent bdb595b commit 55e4b8b
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/tty/serial/serial_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit 55e4b8b

Please sign in to comment.