mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
watchdog: f71808e_wdt: fix inaccurate report in WDIOC_GETTIMEOUT
[ Upstream commit164483c735
] The fintek watchdog timer can configure timeouts of second granularity only up to 255 seconds. Beyond that, the timeout needs to be configured with minute granularity. WDIOC_GETTIMEOUT should report the actual timeout configured, not just echo back the timeout configured by the user. Do so. Fixes:96cb4eb019
("watchdog: f71808e_wdt: new watchdog driver for Fintek F71808E and F71882FG") Suggested-by: Guenter Roeck <linux@roeck-us.net> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> Link: https://lore.kernel.org/r/5e17960fe8cc0e3cb2ba53de4730b75d9a0f33d5.1628525954.git-series.a.fatoum@pengutronix.de Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
162a1cfcd5
commit
59e97c74d1
1 changed files with 3 additions and 1 deletions
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue