diff options
| author | Sujoy Ray <sujoy.ray@intel.com> | 2022-03-11 21:43:25 +0300 |
|---|---|---|
| committer | Sujoy Ray <sujoy.ray@intel.com> | 2022-03-11 23:10:46 +0300 |
| commit | 875e0c507c6de68fb61d2042041303d716bbcd30 (patch) | |
| tree | cec6c4d2af2a5f53e6b16c8c391f880d8b864aa5 /drivers/watchdog | |
| parent | d640749c5f44fac25f8bd109c16ecadb5b79da97 (diff) | |
| parent | 2befcc6bb0bb1e0a4a31391a359adcab3925b6e4 (diff) | |
| download | linux-875e0c507c6de68fb61d2042041303d716bbcd30.tar.xz | |
Merge commit '2befcc6bb0bb1e0a4a31391a359adcab3925b6e4' of https://github.com/openbmc/linux into openbmc/linux_5.15.24_bump
Signed-off-by: Sujoy Ray <sujoy.ray@intel.com>
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; |