Fix set_timeout for big timeout values
Subsystems (2)
PATCH 1/1 Fix set_timeout for big timeout values
This patch implements the documented behavior: if max_hw_heartbeat_ms is implemented, the minimum of the set_timeout argument and max_hw_heartbeat_ms should be used.
Previously only the first 7 bits were used and the input argument was returned.
--- drivers/watchdog/imx2_wdt.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/watchdog/imx2_wdt.c +4 -2
@@ -178,9 +178,11 @@ 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; - wdog->timeout = new_timeout; + actual =min (new_timeout, wdog->max_hw_heartbeat_ms *1000 ); +__imx2_wdt_set_timeout (wdog, actual); + wdog->timeout = new_timeout;return 0 ; }
Signature · 1 line
2.7.4
Quoted 7 lines · Georg Hofmann
This patch implements the documented behavior: if
max_hw_heartbeat_msis implemented, the minimum of theset_timeoutargument andmax_hw_heartbeat_msshould be used.
Previously only the first 7 bits were used and the input argument was returned.Signed-off-by Georg Hofmann <[email protected]>
Quoted 25 lines
--- drivers/watchdog/imx2_wdt.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/watchdog/imx2_wdt.c +4
-2@@ -178,9 +178,11 @@ 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; - wdog->timeout = new_timeout; + actual =min (new_timeout, wdog->max_hw_heartbeat_ms *1000 ); +__imx2_wdt_set_timeout (wdog, actual); + wdog->timeout = new_timeout;return 0 ; }Signature · 2 lines
-- 2.7.4
Guenter Roeck
maintainerQuoted 7 lines · Georg Hofmann
This patch implements the documented behavior: if
max_hw_heartbeat_msis implemented, the minimum of theset_timeoutargument andmax_hw_heartbeat_msshould be used.
Previously only the first 7 bits were used and the input argument was returned.Signed-off-by Georg Hofmann <[email protected]>
The patch below is corrupted (tabs replaced with spaces). Please resend. Also, when doing so, please add "watchdog: imx2_wdt:" to the subject line.
Thanks,
Guenter
Quoted 25 lines
--- drivers/watchdog/imx2_wdt.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/watchdog/imx2_wdt.c +4
-2@@ -178,9 +178,11 @@ 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; - wdog->timeout = new_timeout; + actual =min (new_timeout, wdog->max_hw_heartbeat_ms *1000 ); +__imx2_wdt_set_timeout (wdog, actual); + wdog->timeout = new_timeout;return 0 ; }Signature · 2 lines
-- 2.7.4