From: Greg Kroah-Hartman Date: Mon, 11 Apr 2022 13:28:40 +0000 (+0200) Subject: 4.9-stable patches X-Git-Tag: v4.9.310~38 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=53dd9ceb307d0ea8d8c9428a367830345b478e37;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: dmaengine-revert-dmaengine-shdma-fix-runtime-pm-imbalance-on-error.patch --- diff --git a/queue-4.9/dmaengine-revert-dmaengine-shdma-fix-runtime-pm-imbalance-on-error.patch b/queue-4.9/dmaengine-revert-dmaengine-shdma-fix-runtime-pm-imbalance-on-error.patch new file mode 100644 index 00000000000..7987a0abd96 --- /dev/null +++ b/queue-4.9/dmaengine-revert-dmaengine-shdma-fix-runtime-pm-imbalance-on-error.patch @@ -0,0 +1,33 @@ +From d143f939a95696d38ff800ada14402fa50ebbd6c Mon Sep 17 00:00:00 2001 +From: Vinod Koul +Date: Thu, 10 Mar 2022 10:13:20 +0530 +Subject: dmaengine: Revert "dmaengine: shdma: Fix runtime PM imbalance on error" + +From: Vinod Koul + +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 +Signed-off-by: Greg Kroah-Hartman +--- + 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 +@@ -118,10 +118,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); + diff --git a/queue-4.9/series b/queue-4.9/series index bdbdbc4c324..a0572ab7f07 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -196,3 +196,4 @@ x86-speculation-restore-speculation-related-msrs-during-s3-resume.patch arm64-patch_text-fixup-last-cpu-should-be-master.patch irqchip-gic-v3-fix-gicr_ctlr.rwp-polling.patch tools-build-use-shell-instead-of-to-get-embedded-libperl-s-ccopts.patch +dmaengine-revert-dmaengine-shdma-fix-runtime-pm-imbalance-on-error.patch