On Mon, Mar 09, 2026 at 11:09:03PM -0500, Bjorn Andersson wrote:
> 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
> Signed-off-by: Bjorn Andersson <bjorn.andersson@oss.qualcomm.com>
> ---
> drivers/slimbus/qcom-ngd-ctrl.c | 11 +++++------
> 1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c
> index c69656a0ef1766d5a9df40bdf37bae8f64789fab..b34e727bab086c95dc7e760bf1141baac9ccf6a7 100644
> --- a/drivers/slimbus/qcom-ngd-ctrl.c
> +++ b/drivers/slimbus/qcom-ngd-ctrl.c
> @@ -1662,22 +1662,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;
> }
Reviewed-by: Mukesh Ojha <mukesh.ojha@oss.qualcomm.com>
>
> --
> 2.51.0
>
--
-Mukesh Ojha