Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 196078
b: refs/heads/master
c: 9498dc9
h: refs/heads/master
v: v3
  • Loading branch information
Sonic Zhang authored and Greg Kroah-Hartman committed May 21, 2010
1 parent f09d279 commit f1dd473
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: 1f7d1c85df5b63359e7f7e3fbd1509c1cdd6414f
refs/heads/master: 9498dc95ca6fa6e5b044f39696ab317996fd2fe5
4 changes: 2 additions & 2 deletions trunk/drivers/serial/bfin_sport_uart.c
Original file line number Diff line number Diff line change
Expand Up @@ -498,6 +498,8 @@ static void sport_set_termios(struct uart_port *port,
/* up->parib = 1; */
}

spin_lock_irqsave(&up->port.lock, flags);

port->read_status_mask = OE;
if (termios->c_iflag & INPCK)
port->read_status_mask |= (FE | PE);
Expand Down Expand Up @@ -538,8 +540,6 @@ static void sport_set_termios(struct uart_port *port,
/* uart baud rate */
port->uartclk = uart_get_baud_rate(port, termios, old, 0, get_sclk()/16);

spin_lock_irqsave(&up->port.lock, flags);

/* Disable UART */
SPORT_PUT_TCR1(up, SPORT_GET_TCR1(up) & ~TSPEN);
SPORT_PUT_RCR1(up, SPORT_GET_RCR1(up) & ~RSPEN);
Expand Down

0 comments on commit f1dd473

Please sign in to comment.