summary refs log tree commit diff
path: root/drivers/net/ethernet/i825xx
diff options
context:
space:
mode:
authorMiaoqian Lin <linmq006@gmail.com>2022-01-14 06:57:24 +0000
committerDavid S. Miller <davem@davemloft.net>2022-01-14 11:24:03 +0000
commit99218cbf81bf21355a3de61cd46a706d36e900e6 (patch)
treeeaa17ad9036ca7a7eeb4bc73ebfe05e1103f0f44 /drivers/net/ethernet/i825xx
parentea938248557a52e231a31f338eac4baee36a8626 (diff)
downloadlinux-99218cbf81bf21355a3de61cd46a706d36e900e6.tar.gz
lib82596: Fix IRQ check in sni_82596_probe
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>
Diffstat (limited to 'drivers/net/ethernet/i825xx')
-rw-r--r--drivers/net/ethernet/i825xx/sni_82596.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/i825xx/sni_82596.c b/drivers/net/ethernet/i825xx/sni_82596.c
index 27937c5d7956..daec9ce04531 100644
--- a/drivers/net/ethernet/i825xx/sni_82596.c
+++ b/drivers/net/ethernet/i825xx/sni_82596.c
@@ -117,9 +117,10 @@ static int sni_82596_probe(struct platform_device *dev)
 	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;
 	}