Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1253730e authored by Marcus Folkesson's avatar Marcus Folkesson Committed by Wim Van Sebroeck
Browse files

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: default avatarMarcus Folkesson <marcus.folkesson@gmail.com>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent 63089396

drivers/watchdog/omap_wdt.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -253,10 +253,10 @@ static int omap_wdt_probe(struct platform_device *pdev) 
	wdev->wdog.ops = &omap_wdt_ops;

	wdev->wdog.ops = &omap_wdt_ops;

	wdev->wdog.min_timeout = TIMER_MARGIN_MIN;

	wdev->wdog.min_timeout = TIMER_MARGIN_MIN;

	wdev->wdog.max_timeout = TIMER_MARGIN_MAX;

	wdev->wdog.max_timeout = TIMER_MARGIN_MAX;

	wdev->wdog.timeout = TIMER_MARGIN_DEFAULT;

	wdev->wdog.parent = &pdev->dev;

	wdev->wdog.parent = &pdev->dev;





	if (watchdog_init_timeout(&wdev->wdog, timer_margin, &pdev->dev) < 0)

	watchdog_init_timeout(&wdev->wdog, timer_margin, &pdev->dev);

		wdev->wdog.timeout = TIMER_MARGIN_DEFAULT;





	watchdog_set_nowayout(&wdev->wdog, nowayout);

	watchdog_set_nowayout(&wdev->wdog, nowayout);