CVS Update@linux-mips.org: malta

[chris@linux-mips.org]

CVSROOT:        /home/cvs
Module name:    malta
Changes by:     chris@ftp.linux-mips.org        05/07/28 18:24:16

Modified files:
        linux/drivers/serial: Tag: MaltaRef_2_6 8250.c 

Log message:
        * drivers/serial/8250.c (serial8250_console_write): Grab spinlock
        before modifying the interrupt mask register.

diff -urN malta/linux/drivers/serial/8250.c malta/linux/drivers/serial/8250.c
--- malta/linux/drivers/serial/8250.c   2005/06/21 13:33:05     1.21.1000.3
+++ malta/linux/drivers/serial/8250.c   2005/07/28 17:24:16     1.21.1000.4
@@ -2115,8 +2115,11 @@
        unsigned int ier;
        int i;
 
+       spin_lock(&up->port.lock); 
+ 
+
        /*
-        *      First save the UER then disable the interrupts
+        *      First save the IER then disable the interrupts
         */
        ier = serial_in(up, UART_IER);
 
@@ -2148,6 +2151,8 @@
         */
        wait_for_xmitr(up);
        serial_out(up, UART_IER, ier);
+
+       spin_unlock(&up->port.lock);
 }
 
 static int serial8250_console_setup(struct console *co, char *options)