clk: qcom: q6sstop-qcs404: fix missing resume during probe
authorJohan Hovold <johan+linaro@kernel.org>
Tue, 18 Jul 2023 13:29:00 +0000 (15:29 +0200)
committerBjorn Andersson <andersson@kernel.org>
Tue, 18 Jul 2023 14:58:50 +0000 (07:58 -0700)
Drivers that enable runtime PM must make sure that the controller is
runtime resumed before accessing its registers to prevent the power
domain from being disabled.

Fixes: 6cdef2738db0 ("clk: qcom: Add Q6SSTOP clock controller for QCS404")
Cc: stable@vger.kernel.org # 5.5
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Link: https://lore.kernel.org/r/20230718132902.21430-7-johan+linaro@kernel.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
drivers/clk/qcom/q6sstop-qcs404.c

index 780074e..26e2d63 100644 (file)
@@ -174,21 +174,32 @@ static int q6sstopcc_qcs404_probe(struct platform_device *pdev)
                return ret;
        }
 
+       ret = pm_runtime_resume_and_get(&pdev->dev);
+       if (ret)
+               return ret;
+
        q6sstop_regmap_config.name = "q6sstop_tcsr";
        desc = &tcsr_qcs404_desc;
 
        ret = qcom_cc_probe_by_index(pdev, 1, desc);
        if (ret)
-               return ret;
+               goto err_put_rpm;
 
        q6sstop_regmap_config.name = "q6sstop_cc";
        desc = &q6sstop_qcs404_desc;
 
        ret = qcom_cc_probe_by_index(pdev, 0, desc);
        if (ret)
-               return ret;
+               goto err_put_rpm;
+
+       pm_runtime_put(&pdev->dev);
 
        return 0;
+
+err_put_rpm:
+       pm_runtime_put_sync(&pdev->dev);
+
+       return ret;
 }
 
 static const struct dev_pm_ops q6sstopcc_pm_ops = {