2020-06-04 20:22:13

by Navid Emamdoost

Subject: [PATCH] dmaengine: tegra210-adma: handle pm_runtime_get_sync failure cases

Calling pm_runtime_get_sync increments the counter even in case of
failure, causing incorrect ref count. Call pm_runtime_put if
pm_runtime_get_sync fails.

Signed-off-by: Navid Emamdoost <[email protected]>
---
drivers/dma/tegra210-adma.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/dma/tegra210-adma.c b/drivers/dma/tegra210-adma.c
index c4ce5dfb149b..899eaaf9fc48 100644
--- a/drivers/dma/tegra210-adma.c
+++ b/drivers/dma/tegra210-adma.c
@@ -659,6 +659,7 @@ static int tegra_adma_alloc_chan_resources(struct dma_chan *dc)
ret = pm_runtime_get_sync(tdc2dev(tdc));
if (ret < 0) {
free_irq(tdc->irq, tdc);
+ pm_runtime_put(tdc2dev(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)
--
2.17.1

2020-06-05 06:00:36

by Jon Hunter

Subject: Re: [PATCH] dmaengine: tegra210-adma: handle pm_runtime_get_sync failure cases

On 04/06/2020 21:10, Navid Emamdoost wrote:
> Calling pm_runtime_get_sync increments the counter even in case of
> failure, causing incorrect ref count. Call pm_runtime_put if
> pm_runtime_get_sync fails.
>
> Signed-off-by: Navid Emamdoost <[email protected]>
> ---
> drivers/dma/tegra210-adma.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/dma/tegra210-adma.c b/drivers/dma/tegra210-adma.c
> index c4ce5dfb149b..899eaaf9fc48 100644
> --- a/drivers/dma/tegra210-adma.c
> +++ b/drivers/dma/tegra210-adma.c
> @@ -659,6 +659,7 @@ static int tegra_adma_alloc_chan_resources(struct dma_chan *dc)
> ret = pm_runtime_get_sync(tdc2dev(tdc));
> if (ret < 0) {
> free_irq(tdc->irq, tdc);
> + pm_runtime_put(tdc2dev(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)
>

The label rpm_disable should now be removed. You should also update the
subject-prefix to be [PATCH V2] to make it clear that this is the
updated patch.

Jon

--
nvpublic