4.14-stable patches

added patches:
	dmaengine-revert-dmaengine-shdma-fix-runtime-pm-imbalance-on-error.patch

diff --git a/queue-4.14/dmaengine-revert-dmaengine-shdma-fix-runtime-pm-imbalance-on-error.patch b/queue-4.14/dmaengine-revert-dmaengine-shdma-fix-runtime-pm-imbalance-on-error.patch
new file mode 100644 (file)
index 0000000..7987a0a
--- /dev/null
+++ b/queue-4.14/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 <vkoul@kernel.org>
+Date: Thu, 10 Mar 2022 10:13:20 +0530
+Subject: dmaengine: Revert "dmaengine: shdma: Fix runtime PM imbalance on error"
+
+From: Vinod Koul <vkoul@kernel.org>
+
+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>
+---
+ 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.14/series b/queue-4.14/series
index 21cf027a8dbf934c3367478ab62bec16c0f4633c..3dc044471a209db33c97194c857fee07385071d4 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -255,3 +255,4 @@ arm64-patch_text-fixup-last-cpu-should-be-master.patch
 perf-qcom_l2_pmu-fix-an-incorrect-null-check-on-list-iterator.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