hwrng: exynos - Fix runtime PM imbalance on error

[ Upstream commit 0cdbabf8bb7a6147f5adf37dbc251e92a1bbc2c7 ]

pm_runtime_resume_and_get() wraps around pm_runtime_get_sync() and
decrements the runtime PM usage counter in case the latter function
fails and keeps the counter balanced.

Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/char/hw_random/exynos-trng.c b/drivers/char/hw_random/exynos-trng.c
index b4b52ab23b6b1cea2a77acc07ce6c0d1b647183a..b4e931dbff6640fa977226e8f973727c3e2b6f9f 100644 (file)
--- a/drivers/char/hw_random/exynos-trng.c
+++ b/drivers/char/hw_random/exynos-trng.c
@@ -134,7 +134,7 @@ static int exynos_trng_probe(struct platform_device *pdev)
                return PTR_ERR(trng->mem);
 
        pm_runtime_enable(&pdev->dev);
-       ret = pm_runtime_get_sync(&pdev->dev);
+       ret = pm_runtime_resume_and_get(&pdev->dev);
        if (ret < 0) {
                dev_err(&pdev->dev, "Could not get runtime PM.\n");
                goto err_pm_get;
@@ -167,7 +167,7 @@ err_register:
        clk_disable_unprepare(trng->clk);
 
 err_clock:
-       pm_runtime_put_sync(&pdev->dev);
+       pm_runtime_put_noidle(&pdev->dev);
 
 err_pm_get:
        pm_runtime_disable(&pdev->dev);