From cd258ce4d8d71f0564f5f51187a20c79d1b6fa60 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Sat, 13 Nov 2010 16:21:58 +0100
Subject: [PATCH] --- yaml --- r: 222075 b: refs/heads/master c:
 f8b372a11cc102b9a0dcc6ac2bd10f0b6b2755a9 h: refs/heads/master i:   222073:
 04c4c2c9cdb5317a2867a14f91716e8a99861756   222071:
 98fe06a90fa82291d787334f1e14c42f03d2d1eb v: v3

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

diff --git a/[refs] b/[refs]
index f1fd8c79a8cf..cc3eab1e1c77 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c0caf7bcbfedb3f79ccec759b221bfef0646ada3
+refs/heads/master: f8b372a11cc102b9a0dcc6ac2bd10f0b6b2755a9
diff --git a/trunk/drivers/serial/8250.c b/trunk/drivers/serial/8250.c
index dd5e1ac22251..4d8e14b7aa93 100644
--- a/trunk/drivers/serial/8250.c
+++ b/trunk/drivers/serial/8250.c
@@ -2343,11 +2343,8 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios,
 
 	/*
 	 * CTS flow control flag and modem status interrupts
-	 * Only disable MSI if no threads are waiting in
-	 * serial_core::uart_wait_modem_status
 	 */
-	if (!waitqueue_active(&up->port.state->port.delta_msr_wait))
-		up->ier &= ~UART_IER_MSI;
+	up->ier &= ~UART_IER_MSI;
 	if (!(up->bugs & UART_BUG_NOMSR) &&
 			UART_ENABLE_MS(&up->port, termios->c_cflag))
 		up->ier |= UART_IER_MSI;