On Mon, Apr 08, 2019 at 09:25:54PM +0200, Georg Hofmann wrote:
> 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@xxxxxxxxxxxxxxx>
This time it applied, thanks.
Reviewed-by: Guenter Roeck <linux@xxxxxxxxxxxx>
Guenter
> ---
> drivers/watchdog/imx2_wdt.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c
> index 2b52514..7e7bdcb 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;
> }
