aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSascha Wessel <wessel@nefkom.net>2009-02-11 08:41:05 +0000
committerAndy Green <agreen@octopus.localdomain>2009-02-11 08:41:05 +0000
commit3237030220f974f89b706cb9f6284c8f36a5a5d9 (patch)
treeeec24736c1bed087a06279ac77d2850d31c04a49
parent8c089a1e29ffbe9b7296d71e9c4045292a4679a7 (diff)
ignore-serial-overruns.patch
-rw-r--r--drivers/serial/samsung.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/serial/samsung.c b/drivers/serial/samsung.c
index 4c571461c7f..7b73c697c59 100644
--- a/drivers/serial/samsung.c
+++ b/drivers/serial/samsung.c
@@ -239,8 +239,8 @@ s3c24xx_serial_rx_chars(int irq, void *dev_id)
port->icount.rx++;
if (unlikely(uerstat & S3C2410_UERSTAT_ANY)) {
- printk(KERN_DEBUG "rxerr: port ch=0x%02x, rxs=0x%08x\n",
- ch, uerstat);
+ printk(KERN_DEBUG "rxerr: port=%d ch=0x%02x, rxs=0x%08x\n",
+ port->line, ch, uerstat);
/* check for break */
if (uerstat & S3C2410_UERSTAT_BREAK) {
@@ -269,8 +269,8 @@ s3c24xx_serial_rx_chars(int irq, void *dev_id)
if (uart_handle_sysrq_char(port, ch))
goto ignore_char;
- uart_insert_char(port, uerstat, S3C2410_UERSTAT_OVERRUN,
- ch, flag);
+ if ((uerstat & port->ignore_status_mask & ~S3C2410_UERSTAT_OVERRUN) == 0)
+ tty_insert_flip_char(tty, ch, flag);
ignore_char:
continue;