Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 221911
b: refs/heads/master
c: 5bb06b6
h: refs/heads/master
i:
  221909: 00c6387
  221907: 58e3754
  221903: df528ea
v: v3
  • Loading branch information
Sonic Zhang authored and Greg Kroah-Hartman committed Nov 11, 2010
1 parent 71e89c9 commit 2490335
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6d9e44986891345636e2d6069c4ae1612b2337d4
refs/heads/master: 5bb06b62bc445eed66fb256c3b5f86e5911797e4
4 changes: 2 additions & 2 deletions trunk/drivers/serial/bfin_5xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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 */
Expand Down

0 comments on commit 2490335

Please sign in to comment.