---

yaml --- r: 222075 b: refs/heads/master c: f8b372a h: refs/heads/master i: 222073: 04c4c2c 222071: 98fe06a v: v3
git-mirror · Nov 13, 2010 · cd258ce · cd258ce
1 parent 4e1d231
commit cd258ce
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git 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
@@ -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;