FAILED: patch "[PATCH] slimbus: qcom-ngd-ctrl: Fix probe error path ordering" failed to apply to 6.6-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 6.6-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-6.6.y
git checkout FETCH_HEAD
git cherry-pick -x 2c22ff152d380ec3d3af099fa05d0ac5ca9b4c1e
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026061542-agency-national-2795@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 2c22ff152d380ec3d3af099fa05d0ac5ca9b4c1e Mon Sep 17 00:00:00 2001
From: Bjorn Andersson <[email protected]>
Date: Sat, 30 May 2026 21:44:16 +0100
Subject: [PATCH] slimbus: qcom-ngd-ctrl: Fix probe error path ordering
qcom_slim_ngd_ctrl_probe() first registers the SSR callback then allocates the PDR context, as such the error path needs to come in opposite order to allow us to unroll each step.
drivers/slimbus/qcom-ngd-ctrl.c +5 -6
@@ -1660,22 +1660,21 @@ static int qcom_slim_ngd_ctrl_probe(struct platform_device *pdev)if (IS_ERR (ctrl->pdr)) { ret =dev_err_probe (dev,PTR_ERR (ctrl->pdr),"Failed to init PDR handle\n" ); - goto err_pdr_alloc; + goto err_unregister_ssr; } pds =pdr_add_lookup (ctrl->pdr,"avs/audio" ,"msm/adsp/audio_pd" );if (IS_ERR (pds) &&PTR_ERR (pds) != -EALREADY ) { ret =dev_err_probe (dev,PTR_ERR (pds),"pdr add lookup failed\n" ); - goto err_pdr_lookup; + goto err_pdr_release; }return of_qcom_slim_ngd_register (dev, ctrl); -err_pdr_alloc: -qcom_unregister_ssr_notifier (ctrl->notifier, &ctrl->nb); - -err_pdr_lookup: +err_pdr_release:pdr_handle_release (ctrl->pdr); +err_unregister_ssr: +qcom_unregister_ssr_notifier (ctrl->notifier, &ctrl->nb);return ret; }
Sasha Levin
maintainerPATCH 1/1 slimbus: qcom-ngd-ctrl: Fix probe error path ordering
From: Bjorn Andersson <[email protected]>
[ Upstream commit 2c22ff152d380ec3d3af099fa05d0ac5ca9b4c1e ]
qcom_slim_ngd_ctrl_probe() first registers the SSR callback then allocates the PDR context, as such the error path needs to come in opposite order to allow us to unroll each step.
--- drivers/slimbus/qcom-ngd-ctrl.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/slimbus/qcom-ngd-ctrl.c +5 -6
@@ -1657,23 +1657,22 @@ static int qcom_slim_ngd_ctrl_probe(struct platform_device *pdev)if (IS_ERR (ctrl->pdr)) { ret =dev_err_probe (dev,PTR_ERR (ctrl->pdr),"Failed to init PDR handle\n" ); - goto err_pdr_alloc; + goto err_unregister_ssr; } pds =pdr_add_lookup (ctrl->pdr,"avs/audio" ,"msm/adsp/audio_pd" );if (IS_ERR (pds) &&PTR_ERR (pds) != -EALREADY ) { ret =dev_err_probe (dev,PTR_ERR (pds),"pdr add lookup failed\n" ); - goto err_pdr_lookup; + goto err_pdr_release; }platform_driver_register (&qcom_slim_ngd_driver);return of_qcom_slim_ngd_register (dev, ctrl); -err_pdr_alloc: -qcom_unregister_ssr_notifier (ctrl->notifier, &ctrl->nb); - -err_pdr_lookup: +err_pdr_release:pdr_handle_release (ctrl->pdr); +err_unregister_ssr: +qcom_unregister_ssr_notifier (ctrl->notifier, &ctrl->nb);return ret; }
Signature · 1 line
2.53.0