* [PATCH] [v2] dmaengine: tegra210-adma: Fix runtime PM imbalance on error
@ 2020-05-22 11:48 Dinghao Liu
2020-06-17 14:20 ` Vinod Koul
0 siblings, 1 reply; 2+ messages in thread
From: Dinghao Liu @ 2020-05-22 11:48 UTC (permalink / raw)
To: dinghao.liu, kjlu
Cc: Laxman Dewangan, Jon Hunter, Dan Williams, Vinod Koul,
Thierry Reding, dmaengine, linux-tegra, linux-kernel
pm_runtime_get_sync() increments the runtime PM usage counter even
when it returns an error code. Thus a pairing decrement is needed on
the error handling path to keep the counter balanced.
Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
---
Changelog:
v2: - Merge two patches that fix runtime PM imbalance in
tegra_adma_probe() and tegra_adma_alloc_chan_resources()
respectively.
---
drivers/dma/tegra210-adma.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/dma/tegra210-adma.c b/drivers/dma/tegra210-adma.c
index c4ce5dfb149b..2d6e419b6eac 100644
--- a/drivers/dma/tegra210-adma.c
+++ b/drivers/dma/tegra210-adma.c
@@ -658,6 +658,7 @@ static int tegra_adma_alloc_chan_resources(struct dma_chan *dc)
ret = pm_runtime_get_sync(tdc2dev(tdc));
if (ret < 0) {
+ pm_runtime_put_sync(tdc2dev(tdc));
free_irq(tdc->irq, tdc);
return ret;
}
@@ -870,7 +871,7 @@ static int tegra_adma_probe(struct platform_device *pdev)
ret = pm_runtime_get_sync(&pdev->dev);
if (ret < 0)
- goto rpm_disable;
+ goto rpm_put;
ret = tegra_adma_init(tdma);
if (ret)
@@ -921,7 +922,6 @@ static int tegra_adma_probe(struct platform_device *pdev)
dma_async_device_unregister(&tdma->dma_dev);
rpm_put:
pm_runtime_put_sync(&pdev->dev);
-rpm_disable:
pm_runtime_disable(&pdev->dev);
irq_dispose:
while (--i >= 0)
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] [v2] dmaengine: tegra210-adma: Fix runtime PM imbalance on error
2020-05-22 11:48 [PATCH] [v2] dmaengine: tegra210-adma: Fix runtime PM imbalance on error Dinghao Liu
@ 2020-06-17 14:20 ` Vinod Koul
0 siblings, 0 replies; 2+ messages in thread
From: Vinod Koul @ 2020-06-17 14:20 UTC (permalink / raw)
To: Dinghao Liu
Cc: kjlu, Laxman Dewangan, Jon Hunter, Dan Williams, Thierry Reding,
dmaengine, linux-tegra, linux-kernel
On 22-05-20, 19:48, Dinghao Liu wrote:
> pm_runtime_get_sync() increments the runtime PM usage counter even
> when it returns an error code. Thus a pairing decrement is needed on
> the error handling path to keep the counter balanced.
>
> Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
> ---
>
> Changelog:
>
> v2: - Merge two patches that fix runtime PM imbalance in
> tegra_adma_probe() and tegra_adma_alloc_chan_resources()
> respectively.
> ---
> drivers/dma/tegra210-adma.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/dma/tegra210-adma.c b/drivers/dma/tegra210-adma.c
> index c4ce5dfb149b..2d6e419b6eac 100644
> --- a/drivers/dma/tegra210-adma.c
> +++ b/drivers/dma/tegra210-adma.c
> @@ -658,6 +658,7 @@ static int tegra_adma_alloc_chan_resources(struct dma_chan *dc)
>
> ret = pm_runtime_get_sync(tdc2dev(tdc));
> if (ret < 0) {
> + pm_runtime_put_sync(tdc2dev(tdc));
Pls dont use _sync() here
> free_irq(tdc->irq, tdc);
> return ret;
> }
> @@ -870,7 +871,7 @@ static int tegra_adma_probe(struct platform_device *pdev)
>
> ret = pm_runtime_get_sync(&pdev->dev);
> if (ret < 0)
> - goto rpm_disable;
> + goto rpm_put;
>
> ret = tegra_adma_init(tdma);
> if (ret)
> @@ -921,7 +922,6 @@ static int tegra_adma_probe(struct platform_device *pdev)
> dma_async_device_unregister(&tdma->dma_dev);
> rpm_put:
> pm_runtime_put_sync(&pdev->dev);
> -rpm_disable:
> pm_runtime_disable(&pdev->dev);
> irq_dispose:
> while (--i >= 0)
> --
> 2.17.1
--
~Vinod
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-06-17 14:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-22 11:48 [PATCH] [v2] dmaengine: tegra210-adma: Fix runtime PM imbalance on error Dinghao Liu
2020-06-17 14:20 ` Vinod Koul
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).