diff options
| author | Johan Hovold <johan@kernel.org> | 2025-11-26 15:53:25 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2026-01-30 10:32:24 +0100 |
| commit | 5f13c946ca449fb4991f42fa87706643ca83d1a7 (patch) | |
| tree | ad211725407ea91b4b6d5d2ecbe4e27d59c1f2b7 /drivers/slimbus | |
| parent | b8a26393419514bf7f1dc9ab13c55ecb9db2363d (diff) | |
| download | linux-5f13c946ca449fb4991f42fa87706643ca83d1a7.tar.gz linux-5f13c946ca449fb4991f42fa87706643ca83d1a7.tar.bz2 linux-5f13c946ca449fb4991f42fa87706643ca83d1a7.zip | |
slimbus: core: fix runtime PM imbalance on report present
commit 0eb4ff6596114aabba1070a66afa2c2f5593739f upstream.
Make sure to balance the runtime PM usage count in case slimbus device
or address allocation fails on report present, which would otherwise
prevent the controller from suspending.
Fixes: 4b14e62ad3c9 ("slimbus: Add support for 'clock-pause' feature")
Cc: stable@vger.kernel.org # 4.16
Signed-off-by: Johan Hovold <johan@kernel.org>
Link: https://patch.msgid.link/20251126145329.5022-3-johan@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/slimbus')
| -rw-r--r-- | drivers/slimbus/core.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/drivers/slimbus/core.c b/drivers/slimbus/core.c index 005fa2ef100f..617aac175118 100644 --- a/drivers/slimbus/core.c +++ b/drivers/slimbus/core.c @@ -489,21 +489,23 @@ int slim_device_report_present(struct slim_controller *ctrl, if (ctrl->sched.clk_state != SLIM_CLK_ACTIVE) { dev_err(ctrl->dev, "slim ctrl not active,state:%d, ret:%d\n", ctrl->sched.clk_state, ret); - goto slimbus_not_active; + goto out_put_rpm; } sbdev = slim_get_device(ctrl, e_addr); - if (IS_ERR(sbdev)) - return -ENODEV; + if (IS_ERR(sbdev)) { + ret = -ENODEV; + goto out_put_rpm; + } if (sbdev->is_laddr_valid) { *laddr = sbdev->laddr; - return 0; + ret = 0; + } else { + ret = slim_device_alloc_laddr(sbdev, true); } - ret = slim_device_alloc_laddr(sbdev, true); - -slimbus_not_active: +out_put_rpm: pm_runtime_mark_last_busy(ctrl->dev); pm_runtime_put_autosuspend(ctrl->dev); return ret; |