clk: qcom: mss-sc7180: fix missing resume during probe
authorJohan Hovold <johan+linaro@kernel.org>
Tue, 18 Jul 2023 13:29:01 +0000 (15:29 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 19 Sep 2023 10:27:57 +0000 (12:27 +0200)
commit e2349da0fa7ca822cda72f427345b95795358fe7 upstream.

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: 8def929c4097 ("clk: qcom: Add modem clock controller driver for SC7180")
Cc: stable@vger.kernel.org # 5.7
Cc: Taniya Das <quic_tdas@quicinc.com>
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Link: https://lore.kernel.org/r/20230718132902.21430-8-johan+linaro@kernel.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/clk/qcom/mss-sc7180.c

index 5a14074..d106bc6 100644 (file)
@@ -87,11 +87,22 @@ static int mss_sc7180_probe(struct platform_device *pdev)
                return ret;
        }
 
+       ret = pm_runtime_resume_and_get(&pdev->dev);
+       if (ret)
+               return ret;
+
        ret = qcom_cc_probe(pdev, &mss_sc7180_desc);
        if (ret < 0)
-               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 mss_sc7180_pm_ops = {