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: 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>

diff --git a/drivers/watchdog/gpio_wdt.c b/drivers/watchdog/gpio_wdt.c
index 3ade281903412ab96888e246a05012ea8ec21445..ea77cae03c9d858047ec7175bb95cc2d12d40182 100644 (file)
--- a/drivers/watchdog/gpio_wdt.c
+++ b/drivers/watchdog/gpio_wdt.c
@@ -152,9 +152,9 @@ 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;
+       priv->wdd.timeout       = SOFT_TIMEOUT_DEF;
 
-       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);