diff options
| author | Josh Boyer <jwboyer@linux.vnet.ibm.com> | 2007-10-11 08:45:20 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@linux.vnet.ibm.com> | 2007-10-11 08:45:20 -0400 |
| commit | 0a2cdd88f0b8ea98bcaf9712446cc46a240313f5 (patch) | |
| tree | 05f2ac8731a0b24bba1552458839b1c7d032ff63 /arch/powerpc/boot | |
| parent | cdec12aebe1b10aa58bebaa05bb697843154f7f9 (diff) | |
| parent | 17c5c2093624e81acda16fb737e4679750addd7a (diff) | |
Merge branch 'virtex-for-2.6.24' of git://git.secretlab.ca/git/linux-2.6-virtex into for-2.6.24-4xx
Diffstat (limited to 'arch/powerpc/boot')
| -rw-r--r-- | arch/powerpc/boot/uartlite.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/boot/uartlite.c b/arch/powerpc/boot/uartlite.c index 38a470b329e3..46bed69b4169 100644 --- a/arch/powerpc/boot/uartlite.c +++ b/arch/powerpc/boot/uartlite.c | |||
| @@ -45,8 +45,8 @@ static void uartlite_putc(unsigned char c) | |||
| 45 | 45 | ||
| 46 | static unsigned char uartlite_getc(void) | 46 | static unsigned char uartlite_getc(void) |
| 47 | { | 47 | { |
| 48 | u32 reg = ULITE_STATUS_RXVALID; | 48 | u32 reg = 0; |
| 49 | while (reg & ULITE_STATUS_RXVALID) /* spin on RXVALID bit */ | 49 | while (!(reg & ULITE_STATUS_RXVALID)) /* spin waiting for RXVALID bit */ |
| 50 | reg = in_be32(reg_base + ULITE_STATUS); | 50 | reg = in_be32(reg_base + ULITE_STATUS); |
| 51 | return in_be32(reg_base + ULITE_RX); | 51 | return in_be32(reg_base + ULITE_RX); |
| 52 | } | 52 | } |