Merge upstream 2.6.13-rc1-git1 into 'ieee80211' branch of netdev-2.6.

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c
index 85abd8a045e0..1c9f71617123 100644
--- a/drivers/serial/pmac_zilog.c
+++ b/drivers/serial/pmac_zilog.c
@@ -604,7 +604,7 @@ static void pmz_set_mctrl(struct uart_port *port, unsigned int mctrl)
 /* 
  * Get Modem Control bits (only the input ones, the core will
  * or that with a cached value of the control ones)
- * The port lock is not held.
+ * The port lock is held and interrupts are disabled.
  */
 static unsigned int pmz_get_mctrl(struct uart_port *port)
 {
@@ -615,7 +615,7 @@ static unsigned int pmz_get_mctrl(struct uart_port *port)
         if (ZS_IS_ASLEEP(uap) || uap->node == NULL)
                 return 0;
 
-        status = pmz_peek_status(to_pmz(port));
+        status = read_zsreg(uap, R0);
 
         ret = 0;
         if (status & DCD)