From 2d3d760759bb1df2f2d66efa70cdff33aa96a65b Mon Sep 17 00:00:00 2001
From: Jayachandran C <jayachandranc@netlogicmicro.com>
Date: Mon, 16 Jul 2012 15:33:37 +0530
Subject: [PATCH] --- yaml --- r: 319658 b: refs/heads/master c:
 7e6507ad76a212b961d2392d22a9610be9e4e053 h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/mips/netlogic/common/earlycons.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7212c094d127..4ddf5e2e387c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93a029325979c4baa4cb03286e628b802614b5cb
+refs/heads/master: 7e6507ad76a212b961d2392d22a9610be9e4e053
diff --git a/trunk/arch/mips/netlogic/common/earlycons.c b/trunk/arch/mips/netlogic/common/earlycons.c
index f193f7b3bd81..1902fa22d277 100644
--- a/trunk/arch/mips/netlogic/common/earlycons.c
+++ b/trunk/arch/mips/netlogic/common/earlycons.c
@@ -54,7 +54,7 @@ void prom_putchar(char c)
 #elif defined(CONFIG_CPU_XLR)
 	uartbase = nlm_mmio_base(NETLOGIC_IO_UART_0_OFFSET);
 #endif
-	while (nlm_read_reg(uartbase, UART_LSR) == 0)
+	while ((nlm_read_reg(uartbase, UART_LSR) & UART_LSR_THRE) == 0)
 		;
 	nlm_write_reg(uartbase, UART_TX, c);
 }