diff options
-rw-r--r-- | drivers/serial/bfin_sport_uart.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/bfin_sport_uart.c b/drivers/serial/bfin_sport_uart.c index 8cb0a40c2baa..5224db2d2793 100644 --- a/drivers/serial/bfin_sport_uart.c +++ b/drivers/serial/bfin_sport_uart.c | |||
@@ -498,6 +498,8 @@ static void sport_set_termios(struct uart_port *port, | |||
498 | /* up->parib = 1; */ | 498 | /* up->parib = 1; */ |
499 | } | 499 | } |
500 | 500 | ||
501 | spin_lock_irqsave(&up->port.lock, flags); | ||
502 | |||
501 | port->read_status_mask = OE; | 503 | port->read_status_mask = OE; |
502 | if (termios->c_iflag & INPCK) | 504 | if (termios->c_iflag & INPCK) |
503 | port->read_status_mask |= (FE | PE); | 505 | port->read_status_mask |= (FE | PE); |
@@ -538,8 +540,6 @@ static void sport_set_termios(struct uart_port *port, | |||
538 | /* uart baud rate */ | 540 | /* uart baud rate */ |
539 | port->uartclk = uart_get_baud_rate(port, termios, old, 0, get_sclk()/16); | 541 | port->uartclk = uart_get_baud_rate(port, termios, old, 0, get_sclk()/16); |
540 | 542 | ||
541 | spin_lock_irqsave(&up->port.lock, flags); | ||
542 | |||
543 | /* Disable UART */ | 543 | /* Disable UART */ |
544 | SPORT_PUT_TCR1(up, SPORT_GET_TCR1(up) & ~TSPEN); | 544 | SPORT_PUT_TCR1(up, SPORT_GET_TCR1(up) & ~TSPEN); |
545 | SPORT_PUT_RCR1(up, SPORT_GET_RCR1(up) & ~RSPEN); | 545 | SPORT_PUT_RCR1(up, SPORT_GET_RCR1(up) & ~RSPEN); |