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.

Fixes: 16f14551d0df ("slimbus: qcom-ngd: cleanup in probe error path")
Cc: stable@vger.kernel.org
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Reviewed-by: Mukesh Ojha <mukesh.ojha@oss.qualcomm.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@oss.qualcomm.com>
Signed-off-by: Srinivas Kandagatla <srini@kernel.org>
Link: https://patch.msgid.link/20260530204421.116824-4-srini@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c
index 47ba9fb34d25156d0f4533917609e662f25fc70f..6b91a6f11cb66164527ece371dab8ba77d803ab9 100644 (file)
--- a/drivers/slimbus/qcom-ngd-ctrl.c
+++ b/drivers/slimbus/qcom-ngd-ctrl.c
@@ -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;
 }