watchdog: omap_wdt: change order for setting default timeout
watchdog_init_timeout() will preserve wdd->timeout value if no parameter nor timeout-secs dt property is set. Signed-off-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@iguana.be>
This commit is contained in:
parent
6308939617
commit
1253730ef6
|
@ -253,10 +253,10 @@ static int omap_wdt_probe(struct platform_device *pdev)
|
|||
wdev->wdog.ops = &omap_wdt_ops;
|
||||
wdev->wdog.min_timeout = TIMER_MARGIN_MIN;
|
||||
wdev->wdog.max_timeout = TIMER_MARGIN_MAX;
|
||||
wdev->wdog.timeout = TIMER_MARGIN_DEFAULT;
|
||||
wdev->wdog.parent = &pdev->dev;
|
||||
|
||||
if (watchdog_init_timeout(&wdev->wdog, timer_margin, &pdev->dev) < 0)
|
||||
wdev->wdog.timeout = TIMER_MARGIN_DEFAULT;
|
||||
watchdog_init_timeout(&wdev->wdog, timer_margin, &pdev->dev);
|
||||
|
||||
watchdog_set_nowayout(&wdev->wdog, nowayout);
|
||||
|
||||
|
|
Loading…
Reference in a new issue