Merge tag 'staging-5.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[linux-2.6-microblaze.git] / drivers / watchdog / imx_sc_wdt.c

diff --git a/drivers/watchdog/imx_sc_wdt.c b/drivers/watchdog/imx_sc_wdt.c
index 60a3246..e9ee22a 100644 (file)
--- a/drivers/watchdog/imx_sc_wdt.c
+++ b/drivers/watchdog/imx_sc_wdt.c
@@ -175,6 +175,11 @@ static int imx_sc_wdt_probe(struct platform_device *pdev)
        wdog->timeout = DEFAULT_TIMEOUT;
 
        watchdog_init_timeout(wdog, 0, dev);
+
+       ret = imx_sc_wdt_set_timeout(wdog, wdog->timeout);
+       if (ret)
+               return ret;
+
        watchdog_stop_on_reboot(wdog);
        watchdog_stop_on_unregister(wdog);