diff options
| author |   Christoph Hellwig <hch@hera.kernel.org> | 2005-05-27 01:16:24 -0700 |
|---|---|---|
| committer |   Christoph Hellwig <hch@melbourne.sgi.com> | 2005-05-27 01:16:24 -0700 |
| commit | b19312c4c8f3f84da57bba01d45549df1cf10dcd (patch) | |
| tree | 1c34ce89be6b4e257bc03026d0268deb17727044 /drivers/serial/s3c2410.c | |
| parent | [XFS] Fix directory inodes ioctl compat code, minor code consistency cleanups (diff) | |
| parent | Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| download | linux-dev-b19312c4c8f3f84da57bba01d45549df1cf10dcd.tar.xz linux-dev-b19312c4c8f3f84da57bba01d45549df1cf10dcd.zip | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/serial/s3c2410.c')
| -rw-r--r-- | drivers/serial/s3c2410.c | 15 |
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; |