From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 25 Oct 2016 19:03:57 +0000 (+0200)
Subject: 4.7-stable patches
X-Git-Tag: v4.8.5~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a05868fbffd4486ba214fc6060cb24d12b6e7306;p=thirdparty%2Fkernel%2Fstable-queue.git

4.7-stable patches

added patches:
	platform-don-t-return-0-from-platform_get_irq-on-error.patch
---

diff --git a/queue-4.7/platform-don-t-return-0-from-platform_get_irq-on-error.patch b/queue-4.7/platform-don-t-return-0-from-platform_get_irq-on-error.patch
new file mode 100644
index 00000000000..ed64863b124
--- /dev/null
+++ b/queue-4.7/platform-don-t-return-0-from-platform_get_irq-on-error.patch
@@ -0,0 +1,43 @@
+From e330b9a6bb35dc7097a4f02cb1ae7b6f96df92af Mon Sep 17 00:00:00 2001
+From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
+Date: Mon, 4 Jul 2016 01:04:24 +0300
+Subject: platform: don't return 0 from platform_get_irq[_byname]() on error
+
+From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
+
+commit e330b9a6bb35dc7097a4f02cb1ae7b6f96df92af upstream.
+
+of_irq_get[_byname]() return 0 iff  irq_create_of_mapping() call fails.
+Returning both  error code and 0 on failure is a sign of a misdesigned API,
+it makes the failure check unnecessarily complex and error prone. We should
+rely  on the platform IRQ resource in this case, not return 0,  especially
+as 0 can be  a valid  IRQ resource too...
+
+Fixes: aff008ad813c ("platform_get_irq: Revert to platform_get_resource if of_irq_get fails")
+Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/base/platform.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/base/platform.c
++++ b/drivers/base/platform.c
+@@ -97,7 +97,7 @@ int platform_get_irq(struct platform_dev
+ 		int ret;
+ 
+ 		ret = of_irq_get(dev->dev.of_node, num);
+-		if (ret >= 0 || ret == -EPROBE_DEFER)
++		if (ret > 0 || ret == -EPROBE_DEFER)
+ 			return ret;
+ 	}
+ 
+@@ -175,7 +175,7 @@ int platform_get_irq_byname(struct platf
+ 		int ret;
+ 
+ 		ret = of_irq_get_byname(dev->dev.of_node, name);
+-		if (ret >= 0 || ret == -EPROBE_DEFER)
++		if (ret > 0 || ret == -EPROBE_DEFER)
+ 			return ret;
+ 	}
+ 
diff --git a/queue-4.7/series b/queue-4.7/series
index 70ccb4a9201..7a274cd3c7b 100644
--- a/queue-4.7/series
+++ b/queue-4.7/series
@@ -12,3 +12,4 @@ mmc-block-don-t-use-cmd23-with-very-old-mmc-cards.patch
 mmc-sdhci-cast-unsigned-int-to-unsigned-long-long-to-avoid-unexpeted-error.patch
 pci-mark-atheros-ar9580-to-avoid-bus-reset.patch
 pci-tegra-fix-argument-order-in-tegra_pcie_phy_disable.patch
+platform-don-t-return-0-from-platform_get_irq-on-error.patch