leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

serial: bfin_sport_uart: protect changes to uart_port

Browse Source 
Common serial API says we need to grab the port lock before modifying
the port state to prevent inconsistent state between threads.

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Sonic Zhang 2010-03-09 12:25:34 -05:00 committed by Greg Kroah-Hartman
parent 1f7d1c85df
commit 9498dc95ca
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/serial/bfin_sport_uart.c
View File

@ -498,6 +498,8 @@ static void sport_set_termios(struct uart_port *port,
/* up->parib = 1; */ /* up->parib = 1; */
} }
spin_lock_irqsave(&up->port.lock, flags);
port->read_status_mask = OE; port->read_status_mask = OE;
if (termios->c_iflag & INPCK) if (termios->c_iflag & INPCK)
port->read_status_mask |= (FE | PE); port->read_status_mask |= (FE | PE);
@ -538,8 +540,6 @@ static void sport_set_termios(struct uart_port *port,
/* uart baud rate */ /* uart baud rate */
port->uartclk = uart_get_baud_rate(port, termios, old, 0, get_sclk()/16); port->uartclk = uart_get_baud_rate(port, termios, old, 0, get_sclk()/16);
spin_lock_irqsave(&up->port.lock, flags);
/* Disable UART */ /* Disable UART */
SPORT_PUT_TCR1(up, SPORT_GET_TCR1(up) & ~TSPEN); SPORT_PUT_TCR1(up, SPORT_GET_TCR1(up) & ~TSPEN);
SPORT_PUT_RCR1(up, SPORT_GET_RCR1(up) & ~RSPEN); SPORT_PUT_RCR1(up, SPORT_GET_RCR1(up) & ~RSPEN);