serial: core: Fix regression when runtime PM is not enabled
BugLink: https://bugs.launchpad.net/bugs/2068087 commit 5555980571cc744cd99b6455e3e388b54519db8f upstream. Commit45a3a8ef81("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:45a3a8ef81("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> Signed-off-by: Portia Stephens <portia.stephens@canonical.com> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
This commit is contained in:
committed by
Stefan Bader
parent
c7781ac18c
commit
560570a600
@@ -156,7 +156,7 @@ static void __uart_start(struct uart_state *state)
|
||||
* enabled, serial_port_runtime_resume() calls start_tx() again
|
||||
* after enabling the device.
|
||||
*/
|
||||
if (pm_runtime_active(&port_dev->dev))
|
||||
if (!pm_runtime_enabled(port->dev) || pm_runtime_active(&port_dev->dev))
|
||||
port->ops->start_tx(port);
|
||||
pm_runtime_mark_last_busy(&port_dev->dev);
|
||||
pm_runtime_put_autosuspend(&port_dev->dev);
|
||||
|
||||
Reference in New Issue
Block a user