From: "Łukasz Stelmach" <l.stelmach@samsung.com> To: Matt Mackall <mpm@selenic.com>, Herbert Xu <herbert@gondor.apana.org.au>, Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>, linux-samsung-soc@vger.kernel.org, linux-crypto@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: "Bartłomiej Żolnierkiewicz" <b.zolnierkie@samsung.com>, "Marek Szyprowski" <m.szyprowski@samsung.com>, "Łukasz Stelmach" <l.stelmach@samsung.com> Subject: [PATCH v2] hwrng: exynos - Fix runtime PM imbalance on error Date: Thu, 22 Apr 2021 12:41:41 +0200 [thread overview] Message-ID: <20210422104141.17668-1-l.stelmach@samsung.com> (raw) In-Reply-To: CGME20210422104145eucas1p17f46c95b72f3568761a9f7911bf072e1@eucas1p1.samsung.com pm_runtime_get_sync() increments the runtime PM usage counter even the call returns an error code. Thus a pairing decrement is needed on the error handling path to keep the counter balanced. Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com> --- Changes in v2: - removed Change-Id from the commit message drivers/char/hw_random/exynos-trng.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/char/hw_random/exynos-trng.c b/drivers/char/hw_random/exynos-trng.c index 8e1fe3f8dd2d..9f455d952e87 100644 --- a/drivers/char/hw_random/exynos-trng.c +++ b/drivers/char/hw_random/exynos-trng.c @@ -142,13 +142,13 @@ static int exynos_trng_probe(struct platform_device *pdev) if (IS_ERR(trng->clk)) { ret = PTR_ERR(trng->clk); dev_err(&pdev->dev, "Could not get clock.\n"); - goto err_clock; + goto err_pm_get; } ret = clk_prepare_enable(trng->clk); if (ret) { dev_err(&pdev->dev, "Could not enable the clk.\n"); - goto err_clock; + goto err_pm_get; } ret = devm_hwrng_register(&pdev->dev, &trng->rng); @@ -164,10 +164,8 @@ static int exynos_trng_probe(struct platform_device *pdev) err_register: clk_disable_unprepare(trng->clk); -err_clock: - pm_runtime_put_sync(&pdev->dev); - err_pm_get: + pm_runtime_put_noidle(&pdev->dev); pm_runtime_disable(&pdev->dev); return ret; -- 2.26.2
WARNING: multiple messages have this Message-ID (diff)
From: "Łukasz Stelmach" <l.stelmach@samsung.com> To: Matt Mackall <mpm@selenic.com>, Herbert Xu <herbert@gondor.apana.org.au>, Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>, linux-samsung-soc@vger.kernel.org, linux-crypto@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: "Bartłomiej Żolnierkiewicz" <b.zolnierkie@samsung.com>, "Marek Szyprowski" <m.szyprowski@samsung.com>, "Łukasz Stelmach" <l.stelmach@samsung.com> Subject: [PATCH v2] hwrng: exynos - Fix runtime PM imbalance on error Date: Thu, 22 Apr 2021 12:41:41 +0200 [thread overview] Message-ID: <20210422104141.17668-1-l.stelmach@samsung.com> (raw) In-Reply-To: CGME20210422104145eucas1p17f46c95b72f3568761a9f7911bf072e1@eucas1p1.samsung.com pm_runtime_get_sync() increments the runtime PM usage counter even the call returns an error code. Thus a pairing decrement is needed on the error handling path to keep the counter balanced. Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com> --- Changes in v2: - removed Change-Id from the commit message drivers/char/hw_random/exynos-trng.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/char/hw_random/exynos-trng.c b/drivers/char/hw_random/exynos-trng.c index 8e1fe3f8dd2d..9f455d952e87 100644 --- a/drivers/char/hw_random/exynos-trng.c +++ b/drivers/char/hw_random/exynos-trng.c @@ -142,13 +142,13 @@ static int exynos_trng_probe(struct platform_device *pdev) if (IS_ERR(trng->clk)) { ret = PTR_ERR(trng->clk); dev_err(&pdev->dev, "Could not get clock.\n"); - goto err_clock; + goto err_pm_get; } ret = clk_prepare_enable(trng->clk); if (ret) { dev_err(&pdev->dev, "Could not enable the clk.\n"); - goto err_clock; + goto err_pm_get; } ret = devm_hwrng_register(&pdev->dev, &trng->rng); @@ -164,10 +164,8 @@ static int exynos_trng_probe(struct platform_device *pdev) err_register: clk_disable_unprepare(trng->clk); -err_clock: - pm_runtime_put_sync(&pdev->dev); - err_pm_get: + pm_runtime_put_noidle(&pdev->dev); pm_runtime_disable(&pdev->dev); return ret; -- 2.26.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next parent reply other threads:[~2021-04-22 10:41 UTC|newest] Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <CGME20210422104145eucas1p17f46c95b72f3568761a9f7911bf072e1@eucas1p1.samsung.com> 2021-04-22 10:41 ` Łukasz Stelmach [this message] 2021-04-22 10:41 ` [PATCH v2] hwrng: exynos - Fix runtime PM imbalance on error Łukasz Stelmach 2021-04-22 10:46 ` Krzysztof Kozlowski 2021-04-22 10:46 ` Krzysztof Kozlowski 2021-04-22 11:19 ` Marek Szyprowski 2021-04-22 11:19 ` Marek Szyprowski [not found] ` <CGME20210422112224eucas1p283ca7aeaa25ab514b9743a11e63a76e0@eucas1p2.samsung.com> 2021-04-22 11:22 ` Łukasz Stelmach 2021-04-22 11:22 ` Łukasz Stelmach 2021-04-22 16:31 ` Krzysztof Kozlowski 2021-04-22 16:31 ` Krzysztof Kozlowski 2020-05-22 1:16 [PATCH] [v2] " Dinghao Liu 2020-05-22 1:16 ` Dinghao Liu [not found] ` <CGME20200522090736eucas1p1ad308b9b37d50d9243f0fbeeeb3eab0a@eucas1p1.samsung.com> 2020-05-22 9:07 ` Lukasz Stelmach 2020-05-22 9:07 ` Lukasz Stelmach
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210422104141.17668-1-l.stelmach@samsung.com \ --to=l.stelmach@samsung.com \ --cc=b.zolnierkie@samsung.com \ --cc=herbert@gondor.apana.org.au \ --cc=krzysztof.kozlowski@canonical.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-crypto@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=m.szyprowski@samsung.com \ --cc=mpm@selenic.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.