Commit 545b2baa authored by zhangqilong's avatar zhangqilong Committed by Vinod Koul

dmaengine: mediatek:Fix PM usage reference leak of mtk_uart_apdma_alloc_chan_resources

pm_runtime_get_sync will increment pm usage counter even it failed.
Forgetting to putting operation will result in reference leak here.
We fix it:
1) Replacing it with pm_runtime_resume_and_get to keep usage counter
   balanced.
2) Add putting operation before returning error.

Fixes:9135408c ("dmaengine: mediatek: Add MediaTek UART APDMA support")
Signed-off-by: default avatarZhang Qilong <zhangqilong3@huawei.com>
Link: https://lore.kernel.org/r/20220319022142.142709-1-zhangqilong3@huawei.comSigned-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 7104b9cb
...@@ -274,7 +274,7 @@ static int mtk_uart_apdma_alloc_chan_resources(struct dma_chan *chan) ...@@ -274,7 +274,7 @@ static int mtk_uart_apdma_alloc_chan_resources(struct dma_chan *chan)
unsigned int status; unsigned int status;
int ret; int ret;
ret = pm_runtime_get_sync(mtkd->ddev.dev); ret = pm_runtime_resume_and_get(mtkd->ddev.dev);
if (ret < 0) { if (ret < 0) {
pm_runtime_put_noidle(chan->device->dev); pm_runtime_put_noidle(chan->device->dev);
return ret; return ret;
...@@ -288,18 +288,21 @@ static int mtk_uart_apdma_alloc_chan_resources(struct dma_chan *chan) ...@@ -288,18 +288,21 @@ static int mtk_uart_apdma_alloc_chan_resources(struct dma_chan *chan)
ret = readx_poll_timeout(readl, c->base + VFF_EN, ret = readx_poll_timeout(readl, c->base + VFF_EN,
status, !status, 10, 100); status, !status, 10, 100);
if (ret) if (ret)
return ret; goto err_pm;
ret = request_irq(c->irq, mtk_uart_apdma_irq_handler, ret = request_irq(c->irq, mtk_uart_apdma_irq_handler,
IRQF_TRIGGER_NONE, KBUILD_MODNAME, chan); IRQF_TRIGGER_NONE, KBUILD_MODNAME, chan);
if (ret < 0) { if (ret < 0) {
dev_err(chan->device->dev, "Can't request dma IRQ\n"); dev_err(chan->device->dev, "Can't request dma IRQ\n");
return -EINVAL; ret = -EINVAL;
goto err_pm;
} }
if (mtkd->support_33bits) if (mtkd->support_33bits)
mtk_uart_apdma_write(c, VFF_4G_SUPPORT, VFF_4G_SUPPORT_CLR_B); mtk_uart_apdma_write(c, VFF_4G_SUPPORT, VFF_4G_SUPPORT_CLR_B);
err_pm:
pm_runtime_put_noidle(mtkd->ddev.dev);
return ret; return 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