clk: qcom: gcc-sc8280xp: fix runtime PM imbalance on probe errors

Make sure to decrement the runtime PM usage count before returning in
case RCG dynamic frequency switch initialisation fails.

Fixes: 2a541abd9837 ("clk: qcom: gcc-sc8280xp: Add runtime PM")
Cc: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Link: https://lore.kernel.org/r/20230718132902.21430-5-johan+linaro@kernel.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/drivers/clk/qcom/gcc-sc8280xp.c b/drivers/clk/qcom/gcc-sc8280xp.c
index 1fb6ffa..ac6f8c0 100644 (file)
--- a/drivers/clk/qcom/gcc-sc8280xp.c
+++ b/drivers/clk/qcom/gcc-sc8280xp.c
@@ -7539,8 +7539,8 @@ static int gcc_sc8280xp_probe(struct platform_device *pdev)
 
        regmap = qcom_cc_map(pdev, &gcc_sc8280xp_desc);
        if (IS_ERR(regmap)) {
-               pm_runtime_put(&pdev->dev);
-               return PTR_ERR(regmap);
+               ret = PTR_ERR(regmap);
+               goto err_put_rpm;
        }
 
        /*
@@ -7561,11 +7561,19 @@ static int gcc_sc8280xp_probe(struct platform_device *pdev)
 
        ret = qcom_cc_register_rcg_dfs(regmap, gcc_dfs_clocks, ARRAY_SIZE(gcc_dfs_clocks));
        if (ret)
-               return ret;
+               goto err_put_rpm;
 
        ret = qcom_cc_really_probe(pdev, &gcc_sc8280xp_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;
 }