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;
On 13.03.2023 09:49, Johan Hovold wrote:
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")
The hash seems to be different:
https://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git/commit/?h=icc...
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;
*wipes glasses*.. right..
Reviewed-by: Konrad Dybcio konrad.dybcio@linaro.org
Konrad
} provider = &qp->provider;
On Mon, Mar 13, 2023 at 09:57:46AM +0100, Konrad Dybcio wrote:
On 13.03.2023 09:49, Johan Hovold wrote:
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")
The hash seems to be different:
https://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git/commit/?h=icc...
Bah, thanks for catching that.
Georgi, can you change this to:
Fixes: a8f1b7ca53c2 ("interconnect: qcom: rpm: fix probe PM domain error handling")
unless you decide to fold this fixup in?
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
Johan
linux-stable-mirror@lists.linaro.org