]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
serial: bfin_5xx: grab port lock before making port termios changes
authorSonic Zhang <sonic.zhang@analog.com>
Wed, 27 Oct 2010 08:16:50 +0000 (04:16 -0400)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 11 Nov 2010 19:06:08 +0000 (11:06 -0800)
The port lock exists to protect these resources, so we need to grab it
before making changes.

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>
drivers/serial/bfin_5xx.c

index 965532157c65b747cdf0e6d87606118391d145f4..19cac9f610fd9aa154a976b44410f5bf8187f94f 100644 (file)
@@ -849,6 +849,8 @@ bfin_serial_set_termios(struct uart_port *port, struct ktermios *termios,
        if (termios->c_cflag & CMSPAR)
                lcr |= STP;
 
+       spin_lock_irqsave(&uart->port.lock, flags);
+
        port->read_status_mask = OE;
        if (termios->c_iflag & INPCK)
                port->read_status_mask |= (FE | PE);
@@ -878,8 +880,6 @@ bfin_serial_set_termios(struct uart_port *port, struct ktermios *termios,
        if (termios->c_line != N_IRDA)
                quot -= ANOMALY_05000230;
 
-       spin_lock_irqsave(&uart->port.lock, flags);
-
        UART_SET_ANOMALY_THRESHOLD(uart, USEC_PER_SEC / baud * 15);
 
        /* Disable UART */