path: root/drivers/watchdog
diff options
authorRomain Izard <romain.izard.pro@gmail.com>2018-09-14 10:13:38 (GMT)
committerWim Van Sebroeck <wim@linux-watchdog.org>2018-10-02 11:32:26 (GMT)
commit2e0432f8f8ad11b4bd208445360220efa5b37d82 (patch)
tree0e0975c7c5ab7f6954ab98b949a715a7db885935 /drivers/watchdog
parentd08ec7bea2795be008736a852e67949c162669ed (diff)
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: 976932e40036 ("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>
Diffstat (limited to 'drivers/watchdog')
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/watchdog/sama5d4_wdt.c b/drivers/watchdog/sama5d4_wdt.c
index 2551699..1e93c1b 100644
--- a/drivers/watchdog/sama5d4_wdt.c
+++ b/drivers/watchdog/sama5d4_wdt.c
@@ -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);

Privacy Policy