Merge branch 'virtex-for-2.6.24' of git://git.secretlab.ca/git/linux-2.6-virtex into for-2.6.24-4xx

2007-10-11 07:45:20 -05:00
parent cdec12aebe 17c5c20936
commit 0a2cdd88f0
4 changed files with 205 additions and 86 deletions
--- a/arch/powerpc/boot/uartlite.c
+++ b/arch/powerpc/boot/uartlite.c
@@ -45,8 +45,8 @@ static void uartlite_putc(unsigned char c)

 static unsigned char uartlite_getc(void)
 {
-	u32 reg = ULITE_STATUS_RXVALID;
-	while (reg & ULITE_STATUS_RXVALID) /* spin on RXVALID bit */
+	u32 reg = 0;
+	while (!(reg & ULITE_STATUS_RXVALID)) /* spin waiting for RXVALID bit */
 		reg = in_be32(reg_base + ULITE_STATUS);
 	return in_be32(reg_base + ULITE_RX);
 }