diff options
author | Romain Izard <romain.izard.pro@gmail.com> | 2018-09-14 06:13:38 -0400 |
---|---|---|
committer | Wim Van Sebroeck <wim@linux-watchdog.org> | 2018-10-02 07:32:26 -0400 |
commit | 2e0432f8f8ad11b4bd208445360220efa5b37d82 (patch) | |
tree | 0e0975c7c5ab7f6954ab98b949a715a7db885935 /drivers/watchdog | |
parent | d08ec7bea2795be008736a852e67949c162669ed (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')
-rw-r--r-- | drivers/watchdog/sama5d4_wdt.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/watchdog/sama5d4_wdt.c b/drivers/watchdog/sama5d4_wdt.c index 255169916dbb..1e93c1b0e3cf 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) | |||
247 | } | 247 | } |
248 | } | 248 | } |
249 | 249 | ||
250 | ret = watchdog_init_timeout(wdd, wdt_timeout, &pdev->dev); | 250 | watchdog_init_timeout(wdd, wdt_timeout, &pdev->dev); |
251 | if (ret) { | ||
252 | dev_err(&pdev->dev, "unable to set timeout value\n"); | ||
253 | return ret; | ||
254 | } | ||
255 | 251 | ||
256 | timeout = WDT_SEC2TICKS(wdd->timeout); | 252 | timeout = WDT_SEC2TICKS(wdd->timeout); |
257 | 253 | ||