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

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

watchdog: uniphier: 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>
Acked-by: default avatarKeiji Hayashibara <hayashibara.keiji@socionext.com>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent 321390d9

drivers/watchdog/uniphier_wdt.c

+2 −3
Original line number Diff line number Diff line
@@ -212,11 +212,10 @@ static int uniphier_wdt_probe(struct platform_device *pdev) 
	wdev->wdt_dev.ops = &uniphier_wdt_ops;

	wdev->wdt_dev.max_timeout = WDT_PERIOD_MAX;

	wdev->wdt_dev.min_timeout = WDT_PERIOD_MIN;

	wdev->wdt_dev.timeout = WDT_DEFAULT_TIMEOUT;

	wdev->wdt_dev.parent = dev;



	if (watchdog_init_timeout(&wdev->wdt_dev, timeout, dev) < 0) {

		wdev->wdt_dev.timeout = WDT_DEFAULT_TIMEOUT;

	}

	watchdog_init_timeout(&wdev->wdt_dev, timeout, dev);

	watchdog_set_nowayout(&wdev->wdt_dev, nowayout);

	watchdog_stop_on_reboot(&wdev->wdt_dev);