]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
watchdog: sama5d4: fix timeout-sec usage
authorRomain Izard <romain.izard.pro@gmail.com>
Fri, 14 Sep 2018 10:13:38 +0000 (12:13 +0200)
committerWim Van Sebroeck <wim@linux-watchdog.org>
Tue, 2 Oct 2018 11:32:26 +0000 (13:32 +0200)
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>
drivers/watchdog/sama5d4_wdt.c

index 255169916dbb66e6470489141d385485cf3db91c..1e93c1b0e3cfc224f039c47407a54b6fd7dda7da 100644 (file)
@@ -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);