diff options
| author | Tomas Melin | 2017-03-20 08:29:31 +0100 |
|---|---|---|
| committer | Wim Van Sebroeck | 2017-05-18 18:51:38 +0200 |
| commit | 0ddad77b90cb52075b5a9498f0621e3e265cc19f (patch) | |
| tree | 6c869456cfaff0df49219a7f7f95547946efef25 /drivers/watchdog/cadence_wdt.c | |
| parent | watchdog: pcwd_usb: fix NULL-deref at probe (diff) | |
| download | kernel-qcow2-linux-0ddad77b90cb52075b5a9498f0621e3e265cc19f.tar.gz kernel-qcow2-linux-0ddad77b90cb52075b5a9498f0621e3e265cc19f.tar.xz kernel-qcow2-linux-0ddad77b90cb52075b5a9498f0621e3e265cc19f.zip | |
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>
Diffstat (limited to 'drivers/watchdog/cadence_wdt.c')
| -rw-r--r-- | drivers/watchdog/cadence_wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/cadence_wdt.c b/drivers/watchdog/cadence_wdt.c index 8d61e8bfe60b..86e0b5d2e761 100644 --- a/drivers/watchdog/cadence_wdt.c +++ b/drivers/watchdog/cadence_wdt.c @@ -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); |