summaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorVinod Koul <vkoul@kernel.org>2022-03-10 10:13:20 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-04-13 20:59:26 +0200
commit104bfa23a00120f07b4881e6441bfb4c91a9c89a (patch)
treeb117e08b34135740c1370e8e8a3d68d3515604e6 /drivers/dma
parent3c3a8e56553e427eb07dc69dcaca8a409ab6323b (diff)
downloadlinux-stable-104bfa23a00120f07b4881e6441bfb4c91a9c89a.tar.gz
linux-stable-104bfa23a00120f07b4881e6441bfb4c91a9c89a.tar.bz2
linux-stable-104bfa23a00120f07b4881e6441bfb4c91a9c89a.zip
dmaengine: Revert "dmaengine: shdma: Fix runtime PM imbalance on error"
commit d143f939a95696d38ff800ada14402fa50ebbd6c upstream. This reverts commit 455896c53d5b ("dmaengine: shdma: Fix runtime PM imbalance on error") as the patch wrongly reduced the count on error and did not bail out. So drop the count by reverting the patch . Signed-off-by: Vinod Koul <vkoul@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/sh/shdma-base.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/dma/sh/shdma-base.c b/drivers/dma/sh/shdma-base.c
index 19ac95c0098f..7f72b3f4cd1a 100644
--- a/drivers/dma/sh/shdma-base.c
+++ b/drivers/dma/sh/shdma-base.c
@@ -115,10 +115,8 @@ 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);