[PATCH net-next v6 3/3] net: xilinx: axienet: Fix IRQ error handling
From: phucduc . bui
Date: Wed Sep 09 2026 - 00:57:27 EST
From: bui duc phuc <phucduc.bui@xxxxxxxxx>
irq_of_parse_and_map() returns 0 when parsing or mapping an IRQ fails,
while platform_get_irq() returns a negative error code on failure.
Handle both failure cases appropriately: return -EINVAL when
irq_of_parse_and_map() fails, and propagate the original error code
returned by platform_get_irq() instead of returning -ENOMEM.
Reviewed-by: Simon Horman <horms@xxxxxxxxxx>
Signed-off-by: bui duc phuc <phucduc.bui@xxxxxxxxx>
---
Changes in v4 :
- Add error handling for irq_of_parse_and_map()
Changes in v5 :
- Change the error code returned when irq_of_parse_and_map() fails
from -ENOMEM to -EINVAL.
Changes in v6 :
- Add Simon's Reviewed-by: tag.
- Drop the Fixes: tag as this patch is intended for net-next.
drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
index 3927ababf833..782f903d318f 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
@@ -2971,10 +2971,14 @@ static int axienet_probe(struct platform_device *pdev)
dev_err(&pdev->dev, "could not map DMA regs\n");
return PTR_ERR(lp->dma_regs);
}
- if (lp->rx_irq <= 0 || lp->tx_irq <= 0) {
+ if (!lp->rx_irq || !lp->tx_irq) {
dev_err(&pdev->dev, "could not determine irqs\n");
- return -ENOMEM;
+ return -EINVAL;
}
+ if (lp->rx_irq < 0)
+ return lp->rx_irq;
+ if (lp->tx_irq < 0)
+ return lp->tx_irq;
if (lp->eth_irq < 0 && lp->eth_irq != -ENXIO)
return lp->eth_irq;
--
2.43.0