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

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

watchdog: gpio: 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 1253730e

drivers/watchdog/gpio_wdt.c

+2 −2
Original line number Diff line number Diff line
@@ -152,10 +152,10 @@ static int gpio_wdt_probe(struct platform_device *pdev) 
	priv->wdd.min_timeout	= SOFT_TIMEOUT_MIN;

	priv->wdd.max_hw_heartbeat_ms = hw_margin;

	priv->wdd.parent	= dev;



	if (watchdog_init_timeout(&priv->wdd, 0, dev) < 0)

	priv->wdd.timeout	= SOFT_TIMEOUT_DEF;



	watchdog_init_timeout(&priv->wdd, 0, &pdev->dev);



	watchdog_stop_on_reboot(&priv->wdd);



	if (priv->always_running)