Commit 8830292d authored Jun 24, 2020 by Dinghao Liu Committed by Greg Kroah-Hartman Jul 31, 2020

dmaengine: tegra210-adma: Fix runtime PM imbalance on error



[ Upstream commit 5b78fac4b1ba731cf4177fdbc1e3a4661521bcd0 ]

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>
Reviewed-by: Jon Hunter <jonathanh@nvidia.com>
Link: https://lore.kernel.org/r/20200624064626.19855-1-dinghao.liu@zju.edu.cn


Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent d1893610

drivers/dma/tegra210-adma.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -583,6 +583,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_noidle(tdc2dev(tdc));
		free_irq(tdc->irq, tdc);
		return ret;
		}
		@@ -764,8 +765,10 @@ static int tegra_adma_probe(struct platform_device *pdev)
		pm_runtime_enable(&pdev->dev);

		ret = pm_runtime_get_sync(&pdev->dev);
		if (ret < 0)
		if (ret < 0) {
		pm_runtime_put_noidle(&pdev->dev);
		goto rpm_disable;
		}

		ret = tegra_adma_init(tdma);
		if (ret)