aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2006-01-07 18:11:23 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-01-07 18:11:23 -0500
commitf61051cd2fc58546f28c226933942d4360810ffb (patch)
treebac31cc9c3c857d21b1b084260f443ebc8d25e6c /drivers/serial
parentb9abaa3fb7328851bdeaad19e694048f0ff71d9a (diff)
[SERIAL] Fix clocal wakeup problem
Jim Alexander reported a problem where "if one calls open() in blocking mode with CLOCAL off, the 8250.c driver under the 2.6 kernel (or at least 2.6.8 and 2.6.10) does not wake up the blocked process when DCD is asserted." Fix this by enabling modem status interrupts immediately before we read the carrier detect status. Thanks to Jim for reporting the problem and testing the fix. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/serial')
-rw-r--r--drivers/serial/serial_core.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index 34c576dfad8d..9589509fc5bd 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -1440,6 +1440,7 @@ uart_block_til_ready(struct file *filp, struct uart_state *state)
1440 * modem is ready for us. 1440 * modem is ready for us.
1441 */ 1441 */
1442 spin_lock_irq(&port->lock); 1442 spin_lock_irq(&port->lock);
1443 port->ops->enable_ms(port);
1443 mctrl = port->ops->get_mctrl(port); 1444 mctrl = port->ops->get_mctrl(port);
1444 spin_unlock_irq(&port->lock); 1445 spin_unlock_irq(&port->lock);
1445 if (mctrl & TIOCM_CAR) 1446 if (mctrl & TIOCM_CAR)