FAILED: patch "[PATCH] slimbus: qcom-ngd-ctrl: Balance pm_runtime enablement for NGD" failed to apply to 5.10-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y
git checkout FETCH_HEAD
git cherry-pick -x 6a003446b725c44b9e3ffa111b0effbaa2d43085
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026061531-grit-reps-1ea2@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 6a003446b725c44b9e3ffa111b0effbaa2d43085 Mon Sep 17 00:00:00 2001
From: Bjorn Andersson <[email protected]>
Date: Sat, 30 May 2026 21:44:20 +0100
Subject: [PATCH] slimbus: qcom-ngd-ctrl: Balance pm_runtime enablement for NGD
The pm_runtime_enable() and pm_runtime_use_autosuspend() calls are supposed to be balanced on exit, add these calls.
drivers/slimbus/qcom-ngd-ctrl.c +5 -1
@@ -1582,8 +1582,11 @@ static int qcom_slim_ngd_probe(struct platform_device *pdev)pm_runtime_enable (dev);pm_runtime_get_noresume (dev); ret =qcom_slim_ngd_qmi_svc_event_init (ctrl); -if (ret) +if (ret) {dev_err (&pdev->dev,"QMI service registration failed:%d" , ret); +pm_runtime_dont_use_autosuspend (dev); +pm_runtime_disable (dev); + }return ret; }
@@ -1696,6 +1699,7 @@ static void qcom_slim_ngd_remove(struct platform_device *pdev) {struct qcom_slim_ngd_ctrl *ctrl =platform_get_drvdata (pdev); +pm_runtime_dont_use_autosuspend (&pdev->dev);pm_runtime_disable (&pdev->dev);qcom_slim_ngd_enable (ctrl, false);qcom_slim_ngd_exit_dma (ctrl);
Sasha Levin
maintainerPATCH 1/1 slimbus: qcom-ngd-ctrl: Balance pm_runtime enablement for NGD
From: Bjorn Andersson <[email protected]>
[ Upstream commit 6a003446b725c44b9e3ffa111b0effbaa2d43085 ]
The pm_runtime_enable() and pm_runtime_use_autosuspend() calls are supposed to be balanced on exit, add these calls.
--- drivers/slimbus/qcom-ngd-ctrl.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/slimbus/qcom-ngd-ctrl.c +3 -0
@@ -1399,6 +1399,8 @@ static int qcom_slim_ngd_probe(struct platform_device *pdev) ret =qcom_slim_ngd_qmi_svc_event_init (ctrl);if (ret) {dev_err (&pdev->dev,"QMI service registration failed:%d" , ret); +pm_runtime_dont_use_autosuspend (dev); +pm_runtime_disable (dev);return ret; }
@@ -1482,6 +1484,7 @@ static int qcom_slim_ngd_remove(struct platform_device *pdev) {struct qcom_slim_ngd_ctrl *ctrl =platform_get_drvdata (pdev); +pm_runtime_dont_use_autosuspend (&pdev->dev);pm_runtime_disable (&pdev->dev);qcom_slim_ngd_enable (ctrl, false);qcom_slim_ngd_exit_dma (ctrl);
Signature · 1 line
2.53.0