---

yaml --- r: 38221 b: refs/heads/master c: e480af0 h: refs/heads/master i: 38219: def2e06 v: v3
git-mirror · Oct 1, 2006 · 413b8f6 · 413b8f6
1 parent ab24a21
commit 413b8f6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a6b93a908508810c5d51dd9b390283345af6f2d9
+refs/heads/master: e480af09c49736848f749a43dff2c902104f6691
diff --git a/trunk/drivers/serial/8250.c b/trunk/drivers/serial/8250.c
@@ -2232,9 +2232,10 @@ static inline void wait_for_xmitr(struct uart_8250_port *up, int bits)
 	/* Wait up to 1s for flow control if necessary */
 	if (up->port.flags & UPF_CONS_FLOW) {
 		tmout = 1000000;
-		while (--tmout &&
-		       ((serial_in(up, UART_MSR) & UART_MSR_CTS) == 0))
+		while (!(serial_in(up, UART_MSR) & UART_MSR_CTS) && --tmout) {
 			udelay(1);
+			touch_nmi_watchdog();
+		}
 	}
 }