[PATCH 1/2] rtc: m48t59: Propagate errors from optional IRQ lookup
| Newsgroups | org.kernel.vger.linux-rtc,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 optional IRQ is available, while other errors should be propagated. Propagate all error codes returned by platform_get_irq_optional() other than -ENXIO, so that failures are properly reported to the caller. Preserve NO_IRQ for the case where no optional IRQ is available. Signed-off-by: bui duc phuc <[email protected]> --- drivers/rtc/rtc-m48t59.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c index 4e608bc8bbd3..1150f3f6b008 100644 --- a/drivers/rtc/rtc-m48t59.c +++ b/drivers/rtc/rtc-m48t59.c @@ -404,15 +404,17 @@ static int m48t59_rtc_probe(struct platform_device *pdev) * the mode without IRQ. */ m48t59->irq = platform_get_irq_optional(pdev, 0); - if (m48t59->irq <= 0) - m48t59->irq = NO_IRQ; + if (m48t59->irq < 0 && m48t59->irq != -ENXIO) + return m48t59->irq; - if (m48t59->irq != NO_IRQ) { + if (m48t59->irq > 0) { ret = devm_request_irq(&pdev->dev, m48t59->irq, m48t59_rtc_interrupt, IRQF_SHARED, "rtc-m48t59", &pdev->dev); if (ret) return ret; + } else { + m48t59->irq = NO_IRQ; } m48t59->rtc = devm_rtc_allocate_device(&pdev->dev); -- 2.43.0