]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
clk: qcom: camcc-sc7180: fix async resume during probe
authorJohan Hovold <johan+linaro@kernel.org>
Tue, 18 Jul 2023 13:28:55 +0000 (15:28 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 19 Sep 2023 10:22:55 +0000 (12:22 +0200)
commit c948ff727e25297f3a703eb5349dd66aabf004e4 upstream.

To make sure that the controller is runtime resumed and its power domain
is enabled before accessing its registers during probe, the synchronous
runtime PM interface must be used.

Fixes: 8d4025943e13 ("clk: qcom: camcc-sc7180: Use runtime PM ops instead of clk ones")
Cc: stable@vger.kernel.org # 5.11
Cc: Stephen Boyd <sboyd@kernel.org>
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Link: https://lore.kernel.org/r/20230718132902.21430-2-johan+linaro@kernel.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/clk/qcom/camcc-sc7180.c

index 4b3e3902b7eedcd282dde125c9dc48f7ecaae4e0..ee99e3a853125900ecbc58f690bb304f1408addb 100644 (file)
@@ -1677,7 +1677,7 @@ static int cam_cc_sc7180_probe(struct platform_device *pdev)
                return ret;
        }
 
-       ret = pm_runtime_get(&pdev->dev);
+       ret = pm_runtime_resume_and_get(&pdev->dev);
        if (ret)
                return ret;