From 773a7e9151d477705cb51c379c65af9cd3bc0d07 Mon Sep 17 00:00:00 2001
From: David Daney <ddaney@caviumnetworks.com>
Date: Tue, 5 Oct 2010 11:40:07 -0700
Subject: [PATCH] --- yaml --- r: 213510 b: refs/heads/master c:
 97d303b7657c1a45c158d002f829ff69196c493d h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/serial/8250.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 8d17030b4e7c..61f4360b5516 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd8b6cb4d820c4a717af1a0ac3ee387fd84571cf
+refs/heads/master: 97d303b7657c1a45c158d002f829ff69196c493d
diff --git a/trunk/drivers/serial/8250.c b/trunk/drivers/serial/8250.c
index 24110f6f61e0..31b8cca179cd 100644
--- a/trunk/drivers/serial/8250.c
+++ b/trunk/drivers/serial/8250.c
@@ -1867,15 +1867,17 @@ static void wait_for_xmitr(struct uart_8250_port *up, int bits)
 	unsigned int status, tmout = 10000;
 
 	/* Wait up to 10ms for the character(s) to be sent. */
-	do {
+	for (;;) {
 		status = serial_in(up, UART_LSR);
 
 		up->lsr_saved_flags |= status & LSR_SAVE_FLAGS;
 
+		if ((status & bits) == bits)
+			break;
 		if (--tmout == 0)
 			break;
 		udelay(1);
-	} while ((status & bits) != bits);
+	}
 
 	/* Wait up to 1s for flow control if necessary */
 	if (up->port.flags & UPF_CONS_FLOW) {