Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 400853559E1 for ; Wed, 17 Jun 2026 19:35:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781724917; cv=none; b=g3akQjbSTmqcD6lBN5rQs4CHEeh0TRt3kuBkab8Oaman2bXRLGn7L+YLafo8UZESvcMKLEegkv1m4ahaK8VFP8UCpDBxZOeDxCW6e9C3yZ/CswXALwhL6xe7/9gAGHASJjwl69q0PAjPloBGET0a32+RSDfZIZK6cOqkB6gebmQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781724917; c=relaxed/simple; bh=aagCohebK49//TrH2+eRduxQ5qsJidJev7p1kZMGo8s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=vCEPZXdGZg6zJYoYY34y/M8UO6zmo12fQ8jHjMpmsoO59AJyTzxp3qS90cydlhka87y2sDev4mfkWeTV9uHsLo6AZlmzhMjqnb3hNaS1xrDWMA6zG2mggLiwpji2oylOKeZ8bMf6O9wYx/HcQ5L5z54Ug+csqdHJKG5wfGR+0xw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=TT13+rYh; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="TT13+rYh" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D9B461F000E9; Wed, 17 Jun 2026 19:35:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1781724915; bh=VDWtxav2+Fqr0QA0yOecZSEfOyvJ8M7huYo5/XUDHIU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=TT13+rYh1D6pmU44LvCP+XolOqvLDkrP5h7JXrdD5il4R5O/pBRy2+gASmg3h/XhV oA7h2FIQpnoALGB2OvWC6pdvi7ggWkH8hkwMYLPzhl9K4KsWHKO1+wvrB4yazAQe0E fdGtzfh2B+XJZEbysCThIwfUVfKB5onPMGx9nxIXYHUPbOp+RKimeCRHWEmfgJ0l3Q ihhXTBnyjcpaUgoKpIIO/Ilp+PMw9WUOV0JwlDTBIFSbprwUYPHducGCEEVpIaow9i CR2zG0NHC4WBISnCAXAoCOPjs91dSjewjM01jqpOg8A0Rhy3la3HTk0KGfs56lAJgd HQxqMfhZ31tQw== From: Sasha Levin To: stable@vger.kernel.org Cc: Bjorn Andersson , Dmitry Baryshkov , Mukesh Ojha , Srinivas Kandagatla , Greg Kroah-Hartman , Sasha Levin Subject: [PATCH 6.1.y] slimbus: qcom-ngd-ctrl: Fix probe error path ordering Date: Wed, 17 Jun 2026 15:35:12 -0400 Message-ID: <20260617193512.299844-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026061544-gecko-venus-a2f4@gregkh> References: <2026061544-gecko-venus-a2f4@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Bjorn Andersson [ 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. Fixes: 16f14551d0df ("slimbus: qcom-ngd: cleanup in probe error path") Cc: stable@vger.kernel.org Reviewed-by: Dmitry Baryshkov Reviewed-by: Mukesh Ojha Signed-off-by: Bjorn Andersson Signed-off-by: Srinivas Kandagatla Link: https://patch.msgid.link/20260530204421.116824-4-srini@kernel.org Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- 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 3fa245a472b2ee..215bd535a59e99 100644 --- a/drivers/slimbus/qcom-ngd-ctrl.c +++ b/drivers/slimbus/qcom-ngd-ctrl.c @@ -1586,23 +1586,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; } -- 2.53.0