---

yaml --- r: 304229 b: refs/heads/master c: 55e4b8b h: refs/heads/master i: 304227: 59803ad v: v3
git-mirror · May 15, 2012 · 2fe7ece · 2fe7ece
1 parent eb462b0
commit 2fe7ece
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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);