diff --git a/[refs] b/[refs]
index fbf2efd324a3..a6cdb0d2fc49 100644
--- 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
index a07442ffefbd..0ede0ee64243 100644
--- 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();
+		}
 	}
 }