diff options
| author | Joel Stanley <joel@jms.id.au> | 2021-11-26 02:12:27 +0300 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2021-11-26 02:12:27 +0300 |
| commit | ebd46c8290139e545fbb16201b2b26851a657baa (patch) | |
| tree | 542d613c478f47bc0e9850a17ec32a18a953ccec /drivers/watchdog | |
| parent | 58704e2943803ded612b42510874b63b518aa214 (diff) | |
| parent | f00712e27083550be3031099b7697925533a6e01 (diff) | |
| download | linux-ebd46c8290139e545fbb16201b2b26851a657baa.tar.xz | |
Merge tag 'v5.15.5' into dev-5.15
This is the 5.15.5 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'drivers/watchdog')
| -rw-r--r-- | drivers/watchdog/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/watchdog/f71808e_wdt.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index bf59faeb3de1..d937f957f8df 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -1679,7 +1679,7 @@ config SIBYTE_WDOG config AR7_WDT tristate "TI AR7 Watchdog Timer" - depends on AR7 || (MIPS && COMPILE_TEST) + depends on AR7 || (MIPS && 32BIT && COMPILE_TEST) help Hardware driver for the TI AR7 Watchdog Timer. diff --git a/drivers/watchdog/f71808e_wdt.c b/drivers/watchdog/f71808e_wdt.c index f60beec1bbae..f7d82d261913 100644 --- a/drivers/watchdog/f71808e_wdt.c +++ b/drivers/watchdog/f71808e_wdt.c @@ -228,15 +228,17 @@ static int watchdog_set_timeout(int timeout) mutex_lock(&watchdog.lock); - watchdog.timeout = timeout; if (timeout > 0xff) { watchdog.timer_val = DIV_ROUND_UP(timeout, 60); watchdog.minutes_mode = true; + timeout = watchdog.timer_val * 60; } else { watchdog.timer_val = timeout; watchdog.minutes_mode = false; } + watchdog.timeout = timeout; + mutex_unlock(&watchdog.lock); return 0; |