---

yaml --- r: 319658 b: refs/heads/master c: 7e6507a h: refs/heads/master v: v3
git-mirror · Jul 24, 2012 · 2d3d760 · 2d3d760
1 parent a102333
commit 2d3d760
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);
 }