| From eb9ddd953758907807d8999715f281d33c819c41 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 5 May 2021 20:29:14 +0200 |
| Subject: hwrng: exynos - Fix runtime PM imbalance on error |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Łukasz Stelmach <l.stelmach@samsung.com> |
| |
| [ 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> |
| --- |
| drivers/char/hw_random/exynos-trng.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/char/hw_random/exynos-trng.c b/drivers/char/hw_random/exynos-trng.c |
| index 8e1fe3f8dd2d..c8db62bc5ff7 100644 |
| --- a/drivers/char/hw_random/exynos-trng.c |
| +++ b/drivers/char/hw_random/exynos-trng.c |
| @@ -132,7 +132,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; |
| @@ -165,7 +165,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); |
| -- |
| 2.30.2 |
| |
