Commit 2e0432f8 authored Sep 14, 2018 by Romain Izard Committed by Wim Van Sebroeck Oct 02, 2018

watchdog: sama5d4: fix timeout-sec usage



When using watchdog_init_timeout to update the default timeout value,
an error means that there is no "timeout-sec" in the relevant device
tree node.

This should not prevent binding of the driver to the device.

Fixes: 976932e4 ("watchdog: sama5d4: make use of timeout-secs provided in devicetree")
Signed-off-by: Romain Izard <romain.izard.pro@gmail.com>
Reviewed-by: Marcus Folkesson <marcus.folkesson@gmail.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>

parent d08ec7be

drivers/watchdog/sama5d4_wdt.c

+1 −5

Original line number	Diff line number	Diff line
		@@ -247,11 +247,7 @@ static int sama5d4_wdt_probe(struct platform_device *pdev)
		}
		}

		ret = watchdog_init_timeout(wdd, wdt_timeout, &pdev->dev);
		if (ret) {
		dev_err(&pdev->dev, "unable to set timeout value\n");
		return ret;
		}
		watchdog_init_timeout(wdd, wdt_timeout, &pdev->dev);

		timeout = WDT_SEC2TICKS(wdd->timeout);

Admin message