| Message ID | 20220114065727.22920-1-linmq006@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 99218cbf81bf21355a3de61cd46a706d36e900e6 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | lib82596: Fix IRQ check in sni_82596_probe | expand |
Hello: This patch was applied to netdev/net.git (master) by David S. Miller <davem@davemloft.net>: On Fri, 14 Jan 2022 06:57:24 +0000 you wrote: > 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; > > [...] Here is the summary with links: - lib82596: Fix IRQ check in sni_82596_probe https://git.kernel.org/netdev/net/c/99218cbf81bf You are awesome, thank you!
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; }
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> --- drivers/net/ethernet/i825xx/sni_82596.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)