diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-15 09:44:22 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-15 09:44:22 -0700 |
| commit | 55e4b8b416849753bd7eacd1f2ac3947fcf1c78e (patch) | |
| tree | b00cc75f291a837475da07b60dec589d565dcd91 /drivers/tty | |
| parent | tty: hvc_xen: NULL dereference on allocation failure (diff) | |
| download | linux-dev-55e4b8b416849753bd7eacd1f2ac3947fcf1c78e.tar.xz linux-dev-55e4b8b416849753bd7eacd1f2ac3947fcf1c78e.zip | |
Revert "serial_core: Update buffer overrun statistics."
This reverts commit 642180871bc91afebb6ccf40d1615a7dd33699a3.
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>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/serial_core.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c index a21dc8e3b7c0..246b823c1b27 100644 --- a/drivers/tty/serial/serial_core.c +++ b/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); |