Merge with rsync://fileserver/linux

Update to 2.6.12-rc3

1 files changed, 0 insertions, 3 deletions

diff --git a/drivers/serial/mpsc.c b/drivers/serial/mpsc.c
index a2a643318002..e43276c6a954 100644
--- a/drivers/serial/mpsc.c
+++ b/drivers/serial/mpsc.c
@@ -1058,12 +1058,9 @@ mpsc_get_mctrl(struct uart_port *port)
 {
         struct mpsc_port_info *pi = (struct mpsc_port_info *)port;
         u32 mflags, status;
-        ulong iflags;
 
-        spin_lock_irqsave(&pi->port.lock, iflags);
         status = (pi->mirror_regs) ? pi->MPSC_CHR_10_m :
                 readl(pi->mpsc_base + MPSC_CHR_10);
-        spin_unlock_irqrestore(&pi->port.lock, iflags);
 
         mflags = 0;
         if (status & 0x1)