summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryagi <yagi@ke66.alps.lineo.co.jp>2012-06-08 22:31:39 +0900
committerJustin Waters <justin.waters@timesys.com>2012-07-03 17:15:10 -0400
commitc11dbaef65a0a51942e9dfd11e1ab403639eefb8 (patch)
treed23c4357b953ea6e1d2a7f3f20c10808a890f13d
parentca1aae2ad0eac8089afebf56da2fdaebd8580213 (diff)
fix: early_console
-rw-r--r--drivers/tty/serial/mvf_uart_early.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/tty/serial/mvf_uart_early.c b/drivers/tty/serial/mvf_uart_early.c
index 0939ab5e7452..8d7f7302ba5f 100644
--- a/drivers/tty/serial/mvf_uart_early.c
+++ b/drivers/tty/serial/mvf_uart_early.c
@@ -89,7 +89,7 @@ static inline int mvf_uart_disable(struct mvf_port *sport)
static void __init mvfuart_console_write_char(struct uart_port *port, int ch)
{
- while (readb(port->membase + MVF_UART_S1) & UART_S1_TDRE);
+ while (!(readb(port->membase + MVF_UART_S1) & UART_S1_TDRE));
writeb(ch,port->membase + MVF_UART_D);
@@ -117,6 +117,7 @@ void __init early_mvfuart_console_write(struct console *co, const char *s,
c2 = oldc2 & ~(UART_C2_TE | UART_C2_RE
| UART_C2_RIE | UART_C2_RIE);
+ c2 |= (UART_C2_TE | UART_C2_RE);
writeb(c2, port->membase + MVF_UART_C2);