Merge tag 'watchdog-for-linus-v4.10' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-block.git] / drivers / watchdog / mei_wdt.c

diff --git a/drivers/watchdog/mei_wdt.c b/drivers/watchdog/mei_wdt.c
index 79b35515904e069fcb0f296975fedb59386e45c5..b29c6fde7473ac78cfeed0790c07b761c27239c8 100644 (file)
--- a/drivers/watchdog/mei_wdt.c
+++ b/drivers/watchdog/mei_wdt.c
@@ -389,6 +389,8 @@ static int mei_wdt_register(struct mei_wdt *wdt)
        wdt->wdd.max_timeout = MEI_WDT_MAX_TIMEOUT;
 
        watchdog_set_drvdata(&wdt->wdd, wdt);
+       watchdog_stop_on_reboot(&wdt->wdd);
+
        ret = watchdog_register_device(&wdt->wdd);
        if (ret) {
                dev_err(dev, "unable to register watchdog device = %d.\n", ret);