Commit 0ddad77b authored Mar 20, 2017 by Tomas Melin Committed by Wim Van Sebroeck May 18, 2017

watchdog: cadence_wdt: fix timeout setting



wdt_timeout must not be initialized to CDNS_WDT_DEFAULT_TIMEOUT in
order to allow the value to be overriddden by a device tree setting.

This way, the default timeout value will be used only in case module_param
has not been set, or device tree timeout-sec has not been defined.

Signed-off-by: Tomas Melin <tomas.melin@vaisala.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>

parent 46c319b8

drivers/watchdog/cadence_wdt.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@
		/* Counter maximum value */
		#define CDNS_WDT_COUNTER_MAX 0xFFF

		static int wdt_timeout = CDNS_WDT_DEFAULT_TIMEOUT;
		static int wdt_timeout;
		static int nowayout = WATCHDOG_NOWAYOUT;

		module_param(wdt_timeout, int, 0);