Merge ../linux-2.6/

1 files changed, 7 insertions, 6 deletions

diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c
index 8e65206d3d76..bff42a7b89d0 100644
--- a/drivers/serial/sunzilog.c
+++ b/drivers/serial/sunzilog.c
@@ -610,27 +610,28 @@ static irqreturn_t sunzilog_interrupt(int irq, void *dev_id, struct pt_regs *reg
 static __inline__ unsigned char sunzilog_read_channel_status(struct uart_port *port)
 {
         struct zilog_channel __iomem *channel;
-        unsigned long flags;
         unsigned char status;
 
-        spin_lock_irqsave(&port->lock, flags);
-
         channel = ZILOG_CHANNEL_FROM_PORT(port);
         status = sbus_readb(&channel->control);
         ZSDELAY();
 
-        spin_unlock_irqrestore(&port->lock, flags);
-
         return status;
 }
 
 /* The port lock is not held.  */
 static unsigned int sunzilog_tx_empty(struct uart_port *port)
 {
+        unsigned long flags;
         unsigned char status;
         unsigned int ret;
 
+        spin_lock_irqsave(&port->lock, flags);
+
         status = sunzilog_read_channel_status(port);
+
+        spin_unlock_irqrestore(&port->lock, flags);
+
         if (status & Tx_BUF_EMP)
                 ret = TIOCSER_TEMT;
         else
@@ -639,7 +640,7 @@ static unsigned int sunzilog_tx_empty(struct uart_port *port)
         return ret;
 }
 
-/* The port lock is not held.  */
+/* The port lock is held and interrupts are disabled.  */
 static unsigned int sunzilog_get_mctrl(struct uart_port *port)
 {
         unsigned char status;