summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/imx2_wdt.c
diff options
context:
space:
mode:
authorGeorg Hofmann <georg@hofmannsweb.com>2019-04-08 21:25:54 +0200
committerWim Van Sebroeck <wim@linux-watchdog.org>2019-05-05 21:02:13 +0200
commitb07e228eee69601addba98b47b1a3850569e5013 (patch)
treeb0c93d26aec14719360b8159592c2cc301e29d9e /drivers/watchdog/imx2_wdt.c
parent33052fbb4f25148ffa8fa417aeaab33b9dc3f37e (diff)
downloadlinux-stable-b07e228eee69601addba98b47b1a3850569e5013.tar.gz
linux-stable-b07e228eee69601addba98b47b1a3850569e5013.tar.bz2
linux-stable-b07e228eee69601addba98b47b1a3850569e5013.zip
watchdog: imx2_wdt: Fix set_timeout for big timeout values
The documentated behavior is: if max_hw_heartbeat_ms is implemented, the minimum of the set_timeout argument and max_hw_heartbeat_ms should be used. This patch implements this behavior. Previously only the first 7bits were used and the input argument was returned. Signed-off-by: Georg Hofmann <georg@hofmannsweb.com> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
Diffstat (limited to 'drivers/watchdog/imx2_wdt.c')
-rw-r--r--drivers/watchdog/imx2_wdt.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c
index 1b0faa26dbd4..a606005dd65f 100644
--- a/drivers/watchdog/imx2_wdt.c
+++ b/drivers/watchdog/imx2_wdt.c
@@ -178,8 +178,10 @@ static void __imx2_wdt_set_timeout(struct watchdog_device *wdog,
static int imx2_wdt_set_timeout(struct watchdog_device *wdog,
unsigned int new_timeout)
{
- __imx2_wdt_set_timeout(wdog, new_timeout);
+ unsigned int actual;
+ actual = min(new_timeout, wdog->max_hw_heartbeat_ms * 1000);
+ __imx2_wdt_set_timeout(wdog, actual);
wdog->timeout = new_timeout;
return 0;
}