From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 24 Jan 2022 14:09:47 +0000 (+0100)
Subject: 4.4-stable patches
X-Git-Tag: v4.4.300~45
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d81133fb5878a91d2efb042d939295494c8f52cd;p=thirdparty%2Fkernel%2Fstable-queue.git

4.4-stable patches

added patches:
	lib82596-fix-irq-check-in-sni_82596_probe.patch
---

diff --git a/queue-4.4/lib82596-fix-irq-check-in-sni_82596_probe.patch b/queue-4.4/lib82596-fix-irq-check-in-sni_82596_probe.patch
new file mode 100644
index 00000000000..07e75a90783
--- /dev/null
+++ b/queue-4.4/lib82596-fix-irq-check-in-sni_82596_probe.patch
@@ -0,0 +1,40 @@
+From 99218cbf81bf21355a3de61cd46a706d36e900e6 Mon Sep 17 00:00:00 2001
+From: Miaoqian Lin <linmq006@gmail.com>
+Date: Fri, 14 Jan 2022 06:57:24 +0000
+Subject: lib82596: Fix IRQ check in sni_82596_probe
+
+From: Miaoqian Lin <linmq006@gmail.com>
+
+commit 99218cbf81bf21355a3de61cd46a706d36e900e6 upstream.
+
+platform_get_irq() returns negative error number instead 0 on failure.
+And the doc of platform_get_irq() provides a usage example:
+
+    int irq = platform_get_irq(pdev, 0);
+    if (irq < 0)
+        return irq;
+
+Fix the check of return value to catch errors correctly.
+
+Fixes: 115978859272 ("i825xx: Move the Intel 82586/82593/82596 based drivers")
+Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/net/ethernet/i825xx/sni_82596.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/net/ethernet/i825xx/sni_82596.c
++++ b/drivers/net/ethernet/i825xx/sni_82596.c
+@@ -122,9 +122,10 @@ static int sni_82596_probe(struct platfo
+ 	netdevice->dev_addr[5] = readb(eth_addr + 0x06);
+ 	iounmap(eth_addr);
+ 
+-	if (!netdevice->irq) {
++	if (netdevice->irq < 0) {
+ 		printk(KERN_ERR "%s: IRQ not found for i82596 at 0x%lx\n",
+ 			__FILE__, netdevice->base_addr);
++		retval = netdevice->irq;
+ 		goto probe_failed;
+ 	}
+ 
diff --git a/queue-4.4/series b/queue-4.4/series
index 53d41382bed..a0872bd45f2 100644
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -111,3 +111,4 @@ dmaengine-at_xdmac-fix-lld-view-setting.patch
 dmaengine-at_xdmac-fix-at_xdmac_lld-struct-definition.patch
 net_sched-restore-mpu-xxx-handling.patch
 bcmgenet-add-wol-irq-check.patch
+lib82596-fix-irq-check-in-sni_82596_probe.patch