watchdog: orion: fix platform_get_irq() complaints
[ Upstream commit dcbce5fbcc
]
Fix:
orion_wdt f1020300.watchdog: IRQ index 1 not found
which is caused by platform_get_irq() now complaining when optional
IRQs are not found. Neither interrupt for orion is required, so
make them both optional.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/E1iahcN-0000AT-Co@rmk-PC.armlinux.org.uk
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
5.4-rM2-2.2.x-imx-squashed
parent
b39f38f0eb
commit
3ecda03a5c
|
@ -602,7 +602,7 @@ static int orion_wdt_probe(struct platform_device *pdev)
|
|||
set_bit(WDOG_HW_RUNNING, &dev->wdt.status);
|
||||
|
||||
/* Request the IRQ only after the watchdog is disabled */
|
||||
irq = platform_get_irq(pdev, 0);
|
||||
irq = platform_get_irq_optional(pdev, 0);
|
||||
if (irq > 0) {
|
||||
/*
|
||||
* Not all supported platforms specify an interrupt for the
|
||||
|
@ -617,7 +617,7 @@ static int orion_wdt_probe(struct platform_device *pdev)
|
|||
}
|
||||
|
||||
/* Optional 2nd interrupt for pretimeout */
|
||||
irq = platform_get_irq(pdev, 1);
|
||||
irq = platform_get_irq_optional(pdev, 1);
|
||||
if (irq > 0) {
|
||||
orion_wdt_info.options |= WDIOF_PRETIMEOUT;
|
||||
ret = devm_request_irq(&pdev->dev, irq, orion_wdt_pre_irq,
|
||||
|
|
Loading…
Reference in New Issue