A recent commit broke interconnect provider registration for the msm8996 platform by accidentally removing a conditional when adding the missing clock disable in the power-domain lookup error path.
Fixes: b6edcc7570b2 ("interconnect: qcom: rpm: fix probe PM domain error handling") Reported-by: Christophe JAILLET christophe.jaillet@wanadoo.fr Link: https://lore.kernel.org/r/641d04a3-9236-fe76-a20f-11466a01460e@wanadoo.fr Cc: stable@vger.kernel.org # 5.17 Signed-off-by: Johan Hovold johan+linaro@kernel.org --- drivers/interconnect/qcom/icc-rpm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/interconnect/qcom/icc-rpm.c b/drivers/interconnect/qcom/icc-rpm.c index 4d0997b210f7..3b055cd893ea 100644 --- a/drivers/interconnect/qcom/icc-rpm.c +++ b/drivers/interconnect/qcom/icc-rpm.c @@ -498,7 +498,8 @@ int qnoc_probe(struct platform_device *pdev)
if (desc->has_bus_pd) { ret = dev_pm_domain_attach(dev, true); - goto err_disable_clks; + if (ret) + goto err_disable_clks; }
provider = &qp->provider;