Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

[linux-2.6] / arch / powerpc / boot / uartlite.c

diff --git a/arch/powerpc/boot/uartlite.c b/arch/powerpc/boot/uartlite.c
index 38a470b329e30687817cf6f9769a6959624f5e2a..46bed69b416938477a0be06e14051cacf8427694 100644 (file)
--- 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);
 }