diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-11-13 16:21:58 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-13 09:59:19 -0800 |
| commit | f8b372a11cc102b9a0dcc6ac2bd10f0b6b2755a9 (patch) | |
| tree | 1059e211139ab2e297fba8258037e5a268a70f8d | |
| parent | c0caf7bcbfedb3f79ccec759b221bfef0646ada3 (diff) | |
Revert "8250: Fix tcsetattr to avoid ioctl(TIOCMIWAIT) hang"
This reverts commit 47d3904fe40d62deee8cd46e79ca784e7a548acd.
Crashes any x86 serial console bootup:
Console: colour VGA+ 80x25
BUG: unable to handle kernel NULL pointer dereference at 0000000000000158
IP: [<ffffffff811ebcb4>] serial8250_do_set_termios+0x1d4/0x430
...
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Cc: Greg KH <gregkh@suse.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | drivers/serial/8250.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c index dd5e1ac2225..4d8e14b7aa9 100644 --- a/drivers/serial/8250.c +++ b/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; |