Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce5020ff authored by Ahmad Fatoum's avatar Ahmad Fatoum Committed by Greg Kroah-Hartman
Browse files

watchdog: f71808e_wdt: fix inaccurate report in WDIOC_GETTIMEOUT 



[ Upstream commit 164483c735190775f29d0dcbac0363adc51a068d ]

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: 96cb4eb0 ("watchdog: f71808e_wdt: new watchdog driver for Fintek F71808E and F71882FG")
Suggested-by: default avatarGuenter Roeck <linux@roeck-us.net>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarAhmad Fatoum <a.fatoum@pengutronix.de>
Link: https://lore.kernel.org/r/5e17960fe8cc0e3cb2ba53de4730b75d9a0f33d5.1628525954.git-series.a.fatoum@pengutronix.de


Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@linux-watchdog.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent f96f743a

drivers/watchdog/f71808e_wdt.c

+3 −1
Original line number Diff line number Diff line
@@ -237,15 +237,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;