From f8b372a11cc102b9a0dcc6ac2bd10f0b6b2755a9 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Sat, 13 Nov 2010 16:21:58 +0100 Subject: [PATCH] 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: [] serial8250_do_set_termios+0x1d4/0x430 ... Signed-off-by: Ingo Molnar Cc: Greg KH Cc: Andrew Morton Cc: Alan Cox Signed-off-by: Linus Torvalds --- drivers/serial/8250.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c index dd5e1ac22251..4d8e14b7aa93 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; -- 2.39.5