1 files changed, 2 insertions, 5 deletions

diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index dd5e1ac22251..09a550860dcf 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;
@@ -2875,7 +2872,7 @@ static struct console serial8250_console = {
         .device         = uart_console_device,
         .setup          = serial8250_console_setup,
         .early_setup    = serial8250_console_early_setup,
-        .flags          = CON_PRINTBUFFER,
+        .flags          = CON_PRINTBUFFER | CON_ANYTIME,
         .index          = -1,
         .data           = &serial8250_reg,
 };