clk: qcom: dispcc-sm8450: fix runtime PM imbalance on probe errors

commit b0f3d01bda6c3f6f811e70f76d2040ae81f64565 upstream.

Make sure to decrement the runtime PM usage count before returning in
case regmap initialisation fails.

Fixes: 16fb89f92ec4 ("clk: qcom: Add support for Display Clock Controller on SM8450")
Cc: stable@vger.kernel.org      # 6.1
Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Link: https://lore.kernel.org/r/20230718132902.21430-3-johan+linaro@kernel.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/clk/qcom/dispcc-sm8450.c b/drivers/clk/qcom/dispcc-sm8450.c
index 0cd7ebe90301c054003dd2561fb25a0db33a942b..64626f620a01b61a36d99f8a86e4903e34cb7272 100644 (file)
--- a/drivers/clk/qcom/dispcc-sm8450.c
+++ b/drivers/clk/qcom/dispcc-sm8450.c
@@ -1783,8 +1783,10 @@ static int disp_cc_sm8450_probe(struct platform_device *pdev)
                return ret;
 
        regmap = qcom_cc_map(pdev, &disp_cc_sm8450_desc);
-       if (IS_ERR(regmap))
-               return PTR_ERR(regmap);
+       if (IS_ERR(regmap)) {
+               ret = PTR_ERR(regmap);
+               goto err_put_rpm;
+       }
 
        clk_lucid_evo_pll_configure(&disp_cc_pll0, regmap, &disp_cc_pll0_config);
        clk_lucid_evo_pll_configure(&disp_cc_pll1, regmap, &disp_cc_pll1_config);
@@ -1799,9 +1801,16 @@ static int disp_cc_sm8450_probe(struct platform_device *pdev)
        regmap_update_bits(regmap, 0xe05c, BIT(0), BIT(0));
 
        ret = qcom_cc_really_probe(pdev, &disp_cc_sm8450_desc, regmap);
+       if (ret)
+               goto err_put_rpm;
 
        pm_runtime_put(&pdev->dev);
 
+       return 0;
+
+err_put_rpm:
+       pm_runtime_put_sync(&pdev->dev);
+
        return ret;
 }