From f6e71631474cf5b4c01d46e2b479be6e97bda553 Mon Sep 17 00:00:00 2001 From: Corbin Atkinson Date: Fri, 4 May 2012 12:35:10 -0500 Subject: [PATCH] --- yaml --- r: 304222 b: refs/heads/master c: 642180871bc91afebb6ccf40d1615a7dd33699a3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/serial_core.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 557424ff7983..f461a5687c72 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b1d679afd766cf425ba1cd2a0fd17451bd212f4a +refs/heads/master: 642180871bc91afebb6ccf40d1615a7dd33699a3 diff --git a/trunk/drivers/tty/serial/serial_core.c b/trunk/drivers/tty/serial/serial_core.c index 9c4c05b2825b..59fb3ba1e7ca 100644 --- a/trunk/drivers/tty/serial/serial_core.c +++ b/trunk/drivers/tty/serial/serial_core.c @@ -2526,14 +2526,16 @@ 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) - tty_insert_flip_char(tty, ch, flag); + if (tty_insert_flip_char(tty, ch, flag) == 0) + ++port->icount.buf_overrun; /* * Overrun is special. Since it's reported immediately, * it doesn't affect the current character. */ if (status & ~port->ignore_status_mask & overrun) - tty_insert_flip_char(tty, 0, TTY_OVERRUN); + if (tty_insert_flip_char(tty, 0, TTY_OVERRUN) == 0) + ++port->icount.buf_overrun; } EXPORT_SYMBOL_GPL(uart_insert_char);