Merge with rsync://fileserver/linux

Update to 2.6.12-rc3

1 files changed, 0 insertions, 3 deletions

diff --git a/drivers/serial/au1x00_uart.c b/drivers/serial/au1x00_uart.c
index 5400dc2c087e..6104aeef1243 100644
--- a/drivers/serial/au1x00_uart.c
+++ b/drivers/serial/au1x00_uart.c
@@ -556,13 +556,10 @@ static unsigned int serial8250_tx_empty(struct uart_port *port)
 static unsigned int serial8250_get_mctrl(struct uart_port *port)
 {
         struct uart_8250_port *up = (struct uart_8250_port *)port;
-        unsigned long flags;
         unsigned char status;
         unsigned int ret;
 
-        spin_lock_irqsave(&up->port.lock, flags);
         status = serial_in(up, UART_MSR);
-        spin_unlock_irqrestore(&up->port.lock, flags);
 
         ret = 0;
         if (status & UART_MSR_DCD)