diff options
| author | Tom Rini <trini@konsulko.com> | 2021-04-27 07:32:09 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-04-27 07:32:09 -0400 |
| commit | 3b589d70cdd0147fb5b5c865a31d63b8f0cd685d (patch) | |
| tree | 0f55783252d3a4a408cdd3b2e2854ae6ae3702ae /drivers/watchdog/wdt-uclass.c | |
| parent | ff8cb34d79384524ed81027f7d07a31f7405c27d (diff) | |
| parent | 729c1fe656913f0d5b09e986fec9976020a3363c (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-marvell
- WDT: Enable use of hw_margin_ms=0
- PowerPC: Introduce CONFIG_CACHE_FLUSH_WATCHDOG_THRESHOLD
- PowerPC: Misc changes and fixes to the WDT handling
Diffstat (limited to 'drivers/watchdog/wdt-uclass.c')
| -rw-r--r-- | drivers/watchdog/wdt-uclass.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/wdt-uclass.c b/drivers/watchdog/wdt-uclass.c index 0603ffbd36..2687135296 100644 --- a/drivers/watchdog/wdt-uclass.c +++ b/drivers/watchdog/wdt-uclass.c @@ -148,7 +148,7 @@ void watchdog_reset(void) /* Do not reset the watchdog too often */ now = get_timer(0); - if (time_after(now, next_reset)) { + if (time_after_eq(now, next_reset)) { next_reset = now + reset_period; wdt_reset(gd->watchdog_dev); } |