On Mon, Mar 20, 2017 at 09:29:31AM +0200, Tomas Melin wrote: > 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@xxxxxxxxxxx> Reviewed-by: Guenter Roeck <linux@xxxxxxxxxxxx> > --- > drivers/watchdog/cadence_wdt.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/watchdog/cadence_wdt.c b/drivers/watchdog/cadence_wdt.c > index f0d199a..85960c0 100644 > --- a/drivers/watchdog/cadence_wdt.c > +++ b/drivers/watchdog/cadence_wdt.c > @@ -50,7 +50,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); > -- > 2.1.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
