mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-07 17:19:02 +00:00
dmaengine: stm32-dmamux: Fix PM usage counter unbalance in stm32 dmamux ops
[ Upstream commitbaa16371c9
] 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 by replacing it with pm_runtime_resume_and_get to keep usage counter balanced. Fixes:4f3ceca254
("dmaengine: stm32-dmamux: Add PM Runtime support") Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com> Link: https://lore.kernel.org/r/20210607064640.121394-3-zhangqilong3@huawei.com Signed-off-by: Vinod Koul <vkoul@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
bbce3c99f6
commit
281514da66
1 changed files with 3 additions and 3 deletions
|
@ -137,7 +137,7 @@ static void *stm32_dmamux_route_allocate(struct of_phandle_args *dma_spec,
|
||||||
|
|
||||||
/* Set dma request */
|
/* Set dma request */
|
||||||
spin_lock_irqsave(&dmamux->lock, flags);
|
spin_lock_irqsave(&dmamux->lock, flags);
|
||||||
ret = pm_runtime_get_sync(&pdev->dev);
|
ret = pm_runtime_resume_and_get(&pdev->dev);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
spin_unlock_irqrestore(&dmamux->lock, flags);
|
spin_unlock_irqrestore(&dmamux->lock, flags);
|
||||||
goto error;
|
goto error;
|
||||||
|
@ -336,7 +336,7 @@ static int stm32_dmamux_suspend(struct device *dev)
|
||||||
struct stm32_dmamux_data *stm32_dmamux = platform_get_drvdata(pdev);
|
struct stm32_dmamux_data *stm32_dmamux = platform_get_drvdata(pdev);
|
||||||
int i, ret;
|
int i, ret;
|
||||||
|
|
||||||
ret = pm_runtime_get_sync(dev);
|
ret = pm_runtime_resume_and_get(dev);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
@ -361,7 +361,7 @@ static int stm32_dmamux_resume(struct device *dev)
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
ret = pm_runtime_get_sync(dev);
|
ret = pm_runtime_resume_and_get(dev);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue