AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

dmaengine: tegra20: Fix runtime PM imbalance on error

Browse Source 
[ Upstream commit 917a3200b9f467a154999c7572af345f2470aaf4 ]

pm_runtime_get_sync() will increase the runtime PM counter
even it returns an error. Thus a pairing decrement is needed
to prevent refcount leak. Fix this by replacing this API with
pm_runtime_resume_and_get(), which will not change the runtime
PM counter on error.

Signed-off-by: Dinghao Liu <dinghao.liu@zju.edu.cn>
Acked-by: Thierry Reding <treding@nvidia.com>
Link: https://lore.kernel.org/r/20210409082805.23643-1-dinghao.liu@zju.edu.cn
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Dinghao Liu 2021-04-09 16:28:05 +08:00 committed by Greg Kroah-Hartman
parent 66d0cf7dca
commit d33031a894
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/dma/tegra20-apb-dma.c
View File

@ -723,7 +723,7 @@ static void tegra_dma_issue_pending(struct dma_chan *dc)
goto end; goto end;
} }
if (!tdc->busy) { if (!tdc->busy) {
err = pm_runtime_get_sync(tdc->tdma->dev); err = pm_runtime_resume_and_get(tdc->tdma->dev);
if (err < 0) { if (err < 0) {
dev_err(tdc2dev(tdc), "Failed to enable DMA\n"); dev_err(tdc2dev(tdc), "Failed to enable DMA\n");
goto end; goto end;
@ -818,7 +818,7 @@ static void tegra_dma_synchronize(struct dma_chan *dc)
struct tegra_dma_channel *tdc = to_tegra_dma_chan(dc); struct tegra_dma_channel *tdc = to_tegra_dma_chan(dc);
int err; int err;
err = pm_runtime_get_sync(tdc->tdma->dev); err = pm_runtime_resume_and_get(tdc->tdma->dev);
if (err < 0) { if (err < 0) {
dev_err(tdc2dev(tdc), "Failed to synchronize DMA: %d\n", err); dev_err(tdc2dev(tdc), "Failed to synchronize DMA: %d\n", err);
return; return;