diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-11-07 14:26:42 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-11-07 14:26:42 +0100 |
commit | 047d617c6449da6b17a3b844802bb5e127fef7c3 (patch) | |
tree | 6d28caf8a4f7c155b3406d71a0b5f7c38f844eac /drivers/watchdog/stpmic1_wdt.c | |
parent | cd8a909bb3e7af6d905e4b554b10a3bf9718f5c5 (diff) | |
parent | cbfdbf38c190bc9197f85c9633f103cdc15de571 (diff) | |
download | barebox-047d617c6449da6b17a3b844802bb5e127fef7c3.tar.gz barebox-047d617c6449da6b17a3b844802bb5e127fef7c3.tar.xz |
Merge branch 'for-next/watchdog'
Diffstat (limited to 'drivers/watchdog/stpmic1_wdt.c')
-rw-r--r-- | drivers/watchdog/stpmic1_wdt.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/watchdog/stpmic1_wdt.c b/drivers/watchdog/stpmic1_wdt.c index 5d9720c230..9b7a586387 100644 --- a/drivers/watchdog/stpmic1_wdt.c +++ b/drivers/watchdog/stpmic1_wdt.c @@ -178,7 +178,6 @@ static int stpmic1_wdt_probe(struct device_d *dev) wdd->hwdev = dev; wdd->set_timeout = stpmic1_wdt_set_timeout; wdd->timeout_max = PMIC_WDT_MAX_TIMEOUT; - wdd->timeout_cur = PMIC_WDT_DEFAULT_TIMEOUT; /* have the watchdog reset, not power-off the system */ regmap_write_bits(wdt->regmap, MAIN_CR, RREQ_EN, RREQ_EN); |