diff options
| author | Sonic Zhang <sonic.zhang@analog.com> | 2010-03-09 12:25:34 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-21 09:34:27 -0700 |
| commit | 9498dc95ca6fa6e5b044f39696ab317996fd2fe5 (patch) | |
| tree | 7cbc8e9d5899b3b8e20e5598b08cf901d1733887 /drivers/serial/bfin_sport_uart.c | |
| parent | 1f7d1c85df5b63359e7f7e3fbd1509c1cdd6414f (diff) | |
| download | talos-op-linux-9498dc95ca6fa6e5b044f39696ab317996fd2fe5.tar.gz talos-op-linux-9498dc95ca6fa6e5b044f39696ab317996fd2fe5.zip | |
serial: bfin_sport_uart: protect changes to uart_port
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>
Diffstat (limited to 'drivers/serial/bfin_sport_uart.c')
| -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, /* 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); @@ -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); |
