From: Sasha Levin <sashal@kernel.org>
Date: Fri, 18 Jun 2021 11:47:19 +0000 (-0400)
Subject: Fixes for 4.4
X-Git-Tag: v5.4.128~60
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0fc326313302c0b3f4002c09455040afa4904482;p=thirdparty%2Fkernel%2Fstable-queue.git

Fixes for 4.4

Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/queue-4.4/dmaengine-stedma40-add-missing-iounmap-on-error-in-d.patch b/queue-4.4/dmaengine-stedma40-add-missing-iounmap-on-error-in-d.patch
new file mode 100644
index 00000000000..470801864b5
--- /dev/null
+++ b/queue-4.4/dmaengine-stedma40-add-missing-iounmap-on-error-in-d.patch
@@ -0,0 +1,40 @@
+From 2cedb283f5af950573157565f58636ac71b59152 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Tue, 18 May 2021 22:11:08 +0800
+Subject: dmaengine: stedma40: add missing iounmap() on error in d40_probe()
+
+From: Yang Yingliang <yangyingliang@huawei.com>
+
+[ Upstream commit fffdaba402cea79b8d219355487d342ec23f91c6 ]
+
+Add the missing iounmap() before return from d40_probe()
+in the error handling case.
+
+Fixes: 8d318a50b3d7 ("DMAENGINE: Support for ST-Ericssons DMA40 block v3")
+Reported-by: Hulk Robot <hulkci@huawei.com>
+Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
+Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
+Link: https://lore.kernel.org/r/20210518141108.1324127-1-yangyingliang@huawei.com
+Signed-off-by: Vinod Koul <vkoul@kernel.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/dma/ste_dma40.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
+index 0fede051f4e1..e6d3ed1de374 100644
+--- a/drivers/dma/ste_dma40.c
++++ b/drivers/dma/ste_dma40.c
+@@ -3715,6 +3715,9 @@ failure:
+ 
+ 		kfree(base->lcla_pool.base_unaligned);
+ 
++		if (base->lcpa_base)
++			iounmap(base->lcpa_base);
++
+ 		if (base->phy_lcpa)
+ 			release_mem_region(base->phy_lcpa,
+ 					   base->lcpa_size);
+-- 
+2.30.2
+
diff --git a/queue-4.4/series b/queue-4.4/series
index 7e1ce25df05..0dae9e86bf1 100644
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -11,3 +11,4 @@ rtnetlink-fix-missing-error-code-in-rtnl_bridge_noti.patch
 net-x25-return-the-correct-errno-code.patch
 net-return-the-correct-errno-code.patch
 fib-return-the-correct-errno-code.patch
+dmaengine-stedma40-add-missing-iounmap-on-error-in-d.patch