| From 58e6e7adae5ce918f33983755f1c879b8b82142b Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sat, 15 Jan 2022 21:34:56 -0800 |
| Subject: dmaengine: shdma: Fix runtime PM imbalance on error |
| |
| From: Yongzhi Liu <lyz_cs@pku.edu.cn> |
| |
| [ Upstream commit 455896c53d5b803733ddd84e1bf8a430644439b6 ] |
| |
| pm_runtime_get_() increments the runtime PM usage counter even |
| when it returns an error code, thus a matching decrement is needed on |
| the error handling path to keep the counter balanced. |
| |
| Signed-off-by: Yongzhi Liu <lyz_cs@pku.edu.cn> |
| Link: https://lore.kernel.org/r/1642311296-87020-1-git-send-email-lyz_cs@pku.edu.cn |
| Signed-off-by: Vinod Koul <vkoul@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/dma/sh/shdma-base.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/dma/sh/shdma-base.c b/drivers/dma/sh/shdma-base.c |
| index c51de498b5b4b..19eee3d0900b0 100644 |
| --- a/drivers/dma/sh/shdma-base.c |
| +++ b/drivers/dma/sh/shdma-base.c |
| @@ -115,8 +115,10 @@ static dma_cookie_t shdma_tx_submit(struct dma_async_tx_descriptor *tx) |
| ret = pm_runtime_get(schan->dev); |
| |
| spin_unlock_irq(&schan->chan_lock); |
| - if (ret < 0) |
| + if (ret < 0) { |
| dev_err(schan->dev, "%s(): GET = %d\n", __func__, ret); |
| + pm_runtime_put(schan->dev); |
| + } |
| |
| pm_runtime_barrier(schan->dev); |
| |
| -- |
| 2.34.1 |
| |