[PATCH 07/25] serial: bfin_sport_uart: protect changes to uart_port
in [Kernel]
|
Prev: [PATCH 23/38] sysfs: Implement sysfs_delete_link
Next: [PATCH 09/25] serial: bfin_sport_uart: drop useless status masks
From: Greg Kroah-Hartman on 21 May 2010 13:10 From: Sonic Zhang <sonic.zhang(a)analog.com> 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(a)analog.com> Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de> --- 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 8cb0a40..5224db2 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); -- 1.7.0.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |