Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit dcbce5fbcc69bf2553f650004aad44bf390eca73

Authored by Russell King
Committed by Wim Van Sebroeck
1 parent a76dfb859c

watchdog: orion: fix platform_get_irq() complaints 

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>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

drivers/watchdog/orion_wdt.c
Diff comments   View file @ dcbce5f
... ... @@ -602,7 +602,7 @@
602 602 set_bit(WDOG_HW_RUNNING, &dev->wdt.status);
603 603  
604 604 /* Request the IRQ only after the watchdog is disabled */
605   - irq = platform_get_irq(pdev, 0);
  605 + irq = platform_get_irq_optional(pdev, 0);
606 606 if (irq > 0) {
607 607 /*
608 608 * Not all supported platforms specify an interrupt for the
... ... @@ -617,7 +617,7 @@
617 617 }
618 618  
619 619 /* Optional 2nd interrupt for pretimeout */
620   - irq = platform_get_irq(pdev, 1);
  620 + irq = platform_get_irq_optional(pdev, 1);
621 621 if (irq > 0) {
622 622 orion_wdt_info.options |= WDIOF_PRETIMEOUT;
623 623 ret = devm_request_irq(&pdev->dev, irq, orion_wdt_pre_irq,