---

yaml --- r: 73334 b: refs/heads/master c: 1d6b698 h: refs/heads/master v: v3
git-mirror · Nov 1, 2007 · 29becad · 29becad
1 parent 0d96bd4
commit 29becad
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ae0fa49c6502ca1ada0e043c5d25ee73c0a28c6
+refs/heads/master: 1d6b698764084510fe6168bb5b650165dced03ae
diff --git a/trunk/drivers/serial/uartlite.c b/trunk/drivers/serial/uartlite.c
@@ -329,12 +329,14 @@ static struct uart_ops ulite_ops = {
 static void ulite_console_wait_tx(struct uart_port *port)
 {
 	int i;
+	u8 val;
 
-	/* wait up to 10ms for the character(s) to be sent */
-	for (i = 0; i < 10000; i++) {
-		if (readb(port->membase + ULITE_STATUS) & ULITE_STATUS_TXEMPTY)
+	/* Spin waiting for TX fifo to have space available */
+	for (i = 0; i < 100000; i++) {
+		val = readb(port->membase + ULITE_STATUS);
+		if ((val & ULITE_STATUS_TXFULL) == 0)
 			break;
-		udelay(1);
+		cpu_relax();
 	}
 }