Commit 4f1feb34 authored by Dinghao Liu's avatar Dinghao Liu Committed by Greg Kroah-Hartman

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

[ Upstream commit 5b78fac4 ]

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: default avatarDinghao Liu <dinghao.liu@zju.edu.cn>
Reviewed-by: default avatarJon Hunter <jonathanh@nvidia.com>
Link: https://lore.kernel.org/r/20200624064626.19855-1-dinghao.liu@zju.edu.cnSigned-off-by: default avatarVinod Koul <vkoul@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 652af511
...@@ -583,6 +583,7 @@ static int tegra_adma_alloc_chan_resources(struct dma_chan *dc) ...@@ -583,6 +583,7 @@ static int tegra_adma_alloc_chan_resources(struct dma_chan *dc)
ret = pm_runtime_get_sync(tdc2dev(tdc)); ret = pm_runtime_get_sync(tdc2dev(tdc));
if (ret < 0) { if (ret < 0) {
pm_runtime_put_noidle(tdc2dev(tdc));
free_irq(tdc->irq, tdc); free_irq(tdc->irq, tdc);
return ret; return ret;
} }
...@@ -764,8 +765,10 @@ static int tegra_adma_probe(struct platform_device *pdev) ...@@ -764,8 +765,10 @@ static int tegra_adma_probe(struct platform_device *pdev)
pm_runtime_enable(&pdev->dev); pm_runtime_enable(&pdev->dev);
ret = pm_runtime_get_sync(&pdev->dev); ret = pm_runtime_get_sync(&pdev->dev);
if (ret < 0) if (ret < 0) {
pm_runtime_put_noidle(&pdev->dev);
goto rpm_disable; goto rpm_disable;
}
ret = tegra_adma_init(tdma); ret = tegra_adma_init(tdma);
if (ret) if (ret)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment