From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 22 Jul 2021 13:37:30 +0000 (+0200)
Subject: 4.4-stable patches
X-Git-Tag: v5.4.135~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3909e8674dc073578a6c0dc885895aedd721a870;p=thirdparty%2Fkernel%2Fstable-queue.git

4.4-stable patches

added patches:
	revert-memory-fsl_ifc-fix-leak-of-io-mapping-on-probe-failure.patch
---

diff --git a/queue-4.4/revert-memory-fsl_ifc-fix-leak-of-io-mapping-on-probe-failure.patch b/queue-4.4/revert-memory-fsl_ifc-fix-leak-of-io-mapping-on-probe-failure.patch
new file mode 100644
index 00000000000..3d7a23a97fc
--- /dev/null
+++ b/queue-4.4/revert-memory-fsl_ifc-fix-leak-of-io-mapping-on-probe-failure.patch
@@ -0,0 +1,43 @@
+From 37d3f90a6ae0172abf526f0c46a8157961814b67 Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Thu, 22 Jul 2021 15:35:47 +0200
+Subject: Revert "memory: fsl_ifc: fix leak of IO mapping on probe failure"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit b7a2bcb4a3731d68f938207f75ed3e1d41774510 which is
+commit 3b132ab67fc7a358fff35e808fa65d4bea452521 upstream.
+
+As reported, it breaks the build, the 'gregs' field is not in the 4.4.y
+kernel tree.
+
+Reported-by: Guenter Roeck <linux@roeck-us.net>
+Link: https://lore.kernel.org/r/20210721144845.GA3445926@roeck-us.net
+Cc: Dan Carpenter <dan.carpenter@oracle.com>
+Cc: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
+Cc: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/memory/fsl_ifc.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/memory/fsl_ifc.c
++++ b/drivers/memory/fsl_ifc.c
+@@ -228,7 +228,8 @@ static int fsl_ifc_ctrl_probe(struct pla
+ 	fsl_ifc_ctrl_dev->regs = of_iomap(dev->dev.of_node, 0);
+ 	if (!fsl_ifc_ctrl_dev->regs) {
+ 		dev_err(&dev->dev, "failed to get memory region\n");
+-		return -ENODEV;
++		ret = -ENODEV;
++		goto err;
+ 	}
+ 
+ 	version = ifc_in32(&fsl_ifc_ctrl_dev->regs->ifc_rev) &
+@@ -305,7 +306,6 @@ err_irq:
+ 	free_irq(fsl_ifc_ctrl_dev->irq, fsl_ifc_ctrl_dev);
+ 	irq_dispose_mapping(fsl_ifc_ctrl_dev->irq);
+ err:
+-	iounmap(fsl_ifc_ctrl_dev->gregs);
+ 	return ret;
+ }
+ 
diff --git a/queue-4.4/series b/queue-4.4/series
index c8baf09af16..3708f26c389 100644
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -6,3 +6,4 @@ thermal-core-correct-function-name-thermal_zone_devi.patch
 kbuild-mkcompile_h-consider-timestamp-if-kbuild_buil.patch
 scsi-aic7xxx-fix-unintentional-sign-extension-issue-.patch
 sched-fair-fix-cfs-bandwidth-hrtimer-expiry-type.patch
+revert-memory-fsl_ifc-fix-leak-of-io-mapping-on-probe-failure.patch