From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 3 Jan 2020 15:52:14 +0000 (+0100)
Subject: 4.14-stable patches
X-Git-Tag: v4.4.208~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f297b062d6bdb05d42bfed4cb996ce3a4f63be13;p=thirdparty%2Fkernel%2Fstable-queue.git

4.14-stable patches

added patches:
	spi-fsl-use-platform_get_irq-instead-of-of_irq_to_resource.patch
---

diff --git a/queue-4.14/series b/queue-4.14/series
index 8272e7f51bf..13062692f0b 100644
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -88,3 +88,4 @@ tcp-do-not-send-empty-skb-from-tcp_write_xmit.patch
 gtp-fix-wrong-condition-in-gtp_genl_dump_pdp.patch
 gtp-fix-an-use-after-free-in-ipv4_pdp_find.patch
 gtp-avoid-zero-size-hashtable.patch
+spi-fsl-use-platform_get_irq-instead-of-of_irq_to_resource.patch
diff --git a/queue-4.14/spi-fsl-use-platform_get_irq-instead-of-of_irq_to_resource.patch b/queue-4.14/spi-fsl-use-platform_get_irq-instead-of-of_irq_to_resource.patch
new file mode 100644
index 00000000000..e2097d86868
--- /dev/null
+++ b/queue-4.14/spi-fsl-use-platform_get_irq-instead-of-of_irq_to_resource.patch
@@ -0,0 +1,43 @@
+From 63aa6a692595d47a0785297b481072086b9272d2 Mon Sep 17 00:00:00 2001
+From: Christophe Leroy <christophe.leroy@c-s.fr>
+Date: Thu, 12 Dec 2019 17:47:24 +0000
+Subject: spi: fsl: use platform_get_irq() instead of of_irq_to_resource()
+
+From: Christophe Leroy <christophe.leroy@c-s.fr>
+
+commit 63aa6a692595d47a0785297b481072086b9272d2 upstream.
+
+Unlike irq_of_parse_and_map() which has a dummy definition on SPARC,
+of_irq_to_resource() hasn't.
+
+But as platform_get_irq() can be used instead and is generic, use it.
+
+Reported-by: kbuild test robot <lkp@intel.com>
+Suggested-by: Mark Brown <broonie@kernel.org>
+Fixes: 	3194d2533eff ("spi: fsl: don't map irq during probe")
+Cc: stable@vger.kernel.org
+Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
+Link: https://lore.kernel.org/r/091a277fd0b3356dca1e29858c1c96983fc9cb25.1576172743.git.christophe.leroy@c-s.fr
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Cc: Guenter Roeck <linux@roeck-us.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/spi/spi-fsl-spi.c |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/drivers/spi/spi-fsl-spi.c
++++ b/drivers/spi/spi-fsl-spi.c
+@@ -832,9 +832,9 @@ static int of_fsl_spi_probe(struct platf
+ 	if (ret)
+ 		goto err;
+ 
+-	irq = of_irq_to_resource(np, 0, NULL);
+-	if (irq <= 0) {
+-		ret = -EINVAL;
++	irq = platform_get_irq(ofdev, 0);
++	if (irq < 0) {
++		ret = irq;
+ 		goto err;
+ 	}
+