diff options
| author | Petr Mladek <pmladek@suse.com> | 2025-03-27 11:09:34 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2025-03-27 11:09:34 +0100 |
| commit | f49040c7aaa5532a1f94355ef5073c49e6b32349 (patch) | |
| tree | ee9513bba2c685226ab4addf98152afd262c50c3 /drivers/tty | |
| parent | c1aa3daa517292303d98ff61f0440c354669f948 (diff) | |
| parent | 72c96a2dacc0fb056d13a5f02b0845c4c910fe54 (diff) | |
| download | linux-next-f49040c7aaa5532a1f94355ef5073c49e6b32349.tar.gz linux-next-f49040c7aaa5532a1f94355ef5073c49e6b32349.zip | |
Merge branch 'for-6.15-console-suspend-api-cleanup' into for-linus
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/serial_core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c index 74fa02b23772..4e6bbbeeb2bf 100644 --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c @@ -2442,10 +2442,10 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *uport) } /* - * Disable the console device before suspending. + * Suspend the console device before suspending the port. */ if (uart_console(uport)) - console_stop(uport->cons); + console_suspend(uport->cons); uart_change_pm(state, UART_PM_STATE_OFF); @@ -2500,7 +2500,7 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *uport) uart_port_unlock_irq(uport); } if (console_suspend_enabled) - console_start(uport->cons); + console_resume(uport->cons); } if (tty_port_suspended(port)) { |