summaryrefslogtreecommitdiff
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-20 09:08:30 +0200
commite05a6ae66d99ec297d8f90f58801bee4d1bae960 (patch)
tree1452da0550e56af1fefc9aa05bda920a98fe88bd
parentf31fb76d175cd0aed650f81782b9ce77b5867ae8 (diff)
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>
-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 4f8dfe77da3c..12fa48e380cf 100644
--- a/drivers/dma/sh/shdma-base.c
+++ b/drivers/dma/sh/shdma-base.c
@@ -118,10 +118,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);