Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD

1 files changed, 1 insertions, 14 deletions

diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c
index 435750d40a47..2a9f7ade2c9d 100644
--- a/drivers/serial/s3c2410.c
+++ b/drivers/serial/s3c2410.c
@@ -394,20 +394,7 @@ s3c24xx_serial_rx_chars(int irq, void *dev_id, struct pt_regs *regs)
                 if (uart_handle_sysrq_char(port, ch, regs))
                         goto ignore_char;
 
-                if ((uerstat & port->ignore_status_mask) == 0) {
-                        tty_insert_flip_char(tty, ch, flag);
-                }
-
-                if ((uerstat & S3C2410_UERSTAT_OVERRUN) &&
-                    tty->flip.count < TTY_FLIPBUF_SIZE) {
-                        /*
-                         * Overrun is special, since it's reported
-                         * immediately, and doesn't affect the current
-                         * character.
-                         */
-
-                        tty_insert_flip_char(tty, 0, TTY_OVERRUN);
-                }
+                uart_insert_char(port, uerstat, S3C2410_UERSTAT_OVERRUN, ch, flag);
 
         ignore_char:
                 continue;