From 2490335792706793cf4106bba824251ac6f843a2 Mon Sep 17 00:00:00 2001 From: Sonic Zhang Date: Wed, 27 Oct 2010 04:16:50 -0400 Subject: [PATCH] --- yaml --- r: 221911 b: refs/heads/master c: 5bb06b62bc445eed66fb256c3b5f86e5911797e4 h: refs/heads/master i: 221909: 00c63877a08a4ca5aa532ee8d0351d1f681dbee3 221907: 58e3754ce9db392b2e7e783aced8f8c7033f61c9 221903: df528eacaf4f626fb9ea05ff7ed250f79e58ae57 v: v3 --- [refs] | 2 +- trunk/drivers/serial/bfin_5xx.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5996afccaa98..7af395b9ab53 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d9e44986891345636e2d6069c4ae1612b2337d4 +refs/heads/master: 5bb06b62bc445eed66fb256c3b5f86e5911797e4 diff --git a/trunk/drivers/serial/bfin_5xx.c b/trunk/drivers/serial/bfin_5xx.c index 965532157c65..19cac9f610fd 100644 --- a/trunk/drivers/serial/bfin_5xx.c +++ b/trunk/drivers/serial/bfin_5xx.c @@ -849,6 +849,8 @@ bfin_serial_set_termios(struct uart_port *port, struct ktermios *termios, if (termios->c_cflag & CMSPAR) lcr |= STP; + spin_lock_irqsave(&uart->port.lock, flags); + port->read_status_mask = OE; if (termios->c_iflag & INPCK) port->read_status_mask |= (FE | PE); @@ -878,8 +880,6 @@ bfin_serial_set_termios(struct uart_port *port, struct ktermios *termios, if (termios->c_line != N_IRDA) quot -= ANOMALY_05000230; - spin_lock_irqsave(&uart->port.lock, flags); - UART_SET_ANOMALY_THRESHOLD(uart, USEC_PER_SEC / baud * 15); /* Disable UART */