]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
watchdog: intel-mid_wdt: Add WATCHDOG_NOWAYOUT support
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Tue, 24 Sep 2019 14:31:16 +0000 (17:31 +0300)
committerWim Van Sebroeck <wim@linux-watchdog.org>
Mon, 18 Nov 2019 18:53:39 +0000 (19:53 +0100)
Normally, the watchdog is disabled when /dev/watchdog is closed, but if
CONFIG_WATCHDOG_NOWAYOUT is defined, then it means that the watchdog should
remain enabled. So we should keep it enabled if CONFIG_WATCHDOG_NOWAYOUT
is defined.

Reported-by: Razvan Becheriu <razvan.becheriu@qualitance.com>
Cc: Ferry Toth <fntoth@gmail.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Tested-by: Razvan Becheriu <razvan.becheriu@gmail.com>
Link: https://lore.kernel.org/r/20190924143116.69823-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
drivers/watchdog/intel-mid_wdt.c

index 2cdbd37c700cf01905288fb7d50272e6f51f9506..470213abfd3df65b6f863b664eb7a8aeb96cc2ae 100644 (file)
@@ -134,6 +134,7 @@ static int mid_wdt_probe(struct platform_device *pdev)
        wdt_dev->timeout = MID_WDT_DEFAULT_TIMEOUT;
        wdt_dev->parent = dev;
 
+       watchdog_set_nowayout(wdt_dev, WATCHDOG_NOWAYOUT);
        watchdog_set_drvdata(wdt_dev, dev);
 
        ret = devm_request_irq(dev, pdata->irq, mid_wdt_irq,