From: Vinod Koul <vkoul@xxxxxxxxxx> 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@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/dma/sh/shdma-base.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) --- 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(stru 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); Patches currently in stable-queue which might be from vkoul@xxxxxxxxxx are queue-5.17/phy-amlogic-phy-meson-gxl-usb2-fix-shared-reset-cont.patch queue-5.17/spi-core-add-dma_map_dev-for-__spi_unmap_msg.patch queue-5.17/dmaengine-revert-dmaengine-shdma-fix-runtime-pm-imbalance-on-error.patch queue-5.17/phy-amlogic-meson8b-usb2-use-dev_err_probe.patch queue-5.17/phy-amlogic-meson8b-usb2-fix-shared-reset-control-us.patch