diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-08-19 06:24:50 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-08-19 06:24:50 +0200 |
commit | ebbe30f4bba127505c5664dd67f519e5e06d16be (patch) | |
tree | 7285f44ba6e74a25876982cb50f9a430169cc42e /drivers/tty/serial/fsl_lpuart.c | |
parent | 6pack: propagage new tty types (diff) | |
parent | Linux 6.11-rc4 (diff) | |
download | linux-ebbe30f4bba127505c5664dd67f519e5e06d16be.tar.xz linux-ebbe30f4bba127505c5664dd67f519e5e06d16be.zip |
Merge 6.11-rc4 into tty-next
We need the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/fsl_lpuart.c')
-rw-r--r-- | drivers/tty/serial/fsl_lpuart.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c index 615291ea9b5e..77efa7ee6eda 100644 --- a/drivers/tty/serial/fsl_lpuart.c +++ b/drivers/tty/serial/fsl_lpuart.c @@ -2923,6 +2923,7 @@ static int lpuart_probe(struct platform_device *pdev) pm_runtime_set_autosuspend_delay(&pdev->dev, UART_AUTOSUSPEND_TIMEOUT); pm_runtime_set_active(&pdev->dev); pm_runtime_enable(&pdev->dev); + pm_runtime_mark_last_busy(&pdev->dev); ret = lpuart_global_reset(sport); if (ret) |