Skip to content

Commit 5555980

Browse files
tmlindgregkh
authored andcommitted
serial: core: Fix regression when runtime PM is not enabled
Commit 45a3a8e ("serial: core: Revert checks for tx runtime PM state") caused a regression for Sun Ultra 60 for the sunsab driver as reported by Nick Bowler <nbowler@draconx.ca>. We need to add back the check runtime PM enabled state for serial port controller device, I wrongly assumed earlier we could just remove it. Fixes: 45a3a8e ("serial: core: Revert checks for tx runtime PM state") Cc: stable <stable@kernel.org> Reported-by: Nick Bowler <nbowler@draconx.ca> Signed-off-by: Tony Lindgren <tony@atomide.com> Link: https://lore.kernel.org/r/20240325071649.27040-1-tony@atomide.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 54c4ec5 commit 5555980

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/tty/serial/serial_core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ static void __uart_start(struct uart_state *state)
156156
* enabled, serial_port_runtime_resume() calls start_tx() again
157157
* after enabling the device.
158158
*/
159-
if (pm_runtime_active(&port_dev->dev))
159+
if (!pm_runtime_enabled(port->dev) || pm_runtime_active(&port_dev->dev))
160160
port->ops->start_tx(port);
161161
pm_runtime_mark_last_busy(&port_dev->dev);
162162
pm_runtime_put_autosuspend(&port_dev->dev);

0 commit comments

Comments
 (0)