[PATCH v3] watchdog: orion_wdt: Propagate errors from optional IRQ lookup
| Newsgroups | org.kernel.vger.linux-watchdog,org.kernel.vger.linux-kernel |
|---|---|
| Message-ID | <[email protected]> |
From: bui duc phuc <[email protected]> platform_get_irq_optional() returns a positive IRQ number on success or a negative error code on failure. For an optional IRQ, -ENXIO indicates that no IRQ is available, while other errors should be propagated. Propagate errors such as -EPROBE_DEFER and -EINVAL instead of continuing probe without the IRQ. Signed-off-by: bui duc phuc <[email protected]> --- Link v2 : https://lore.kernel.org/all/[email protected]/ Changes in v3: - Use goto disable_clk instead of returning directly. - Add similar error handling for the second platform_get_irq_optional() call. drivers/watchdog/orion_wdt.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c index 0e145f762f6f..6715186aeac4 100644 --- a/drivers/watchdog/orion_wdt.c +++ b/drivers/watchdog/orion_wdt.c @@ -606,6 +606,10 @@ static int orion_wdt_probe(struct platform_device *pdev) /* Request the IRQ only after the watchdog is disabled */ irq = platform_get_irq_optional(pdev, 0); + if (irq < 0 && irq != -ENXIO) { + ret = irq; + goto disable_clk; + } if (irq > 0) { /* * Not all supported platforms specify an interrupt for the @@ -621,6 +625,10 @@ static int orion_wdt_probe(struct platform_device *pdev) /* Optional 2nd interrupt for pretimeout */ irq = platform_get_irq_optional(pdev, 1); + if (irq < 0 && irq != -ENXIO) { + ret = irq; + goto disable_clk; + } if (irq > 0) { orion_wdt_info.options |= WDIOF_PRETIMEOUT; ret = devm_request_irq(&pdev->dev, irq, orion_wdt_pre_irq, -- 2.43.0