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

Commit 1e935949 authored by Guenter Roeck's avatar Guenter Roeck Committed by Wim Van Sebroeck
Browse files

watchdog: Always evaluate new timeout against min_timeout 



Up to now, a new timeout value is only evaluated against min_timeout
if max_timeout is provided. This does not really make sense; a driver
can have a minimum timeout even if it does not have a maximum timeout.
Ensure that it is not smaller than min_timeout, even if max_timeout
is not set.

Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Acked-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent 8cbb97ea

include/linux/watchdog.h

+9 −2
Original line number Original line Diff line number Diff line
@@ -119,8 +119,15 @@ static inline void watchdog_set_nowayout(struct watchdog_device *wdd, bool noway 
/* Use the following function to check if a timeout value is invalid */

/* Use the following function to check if a timeout value is invalid */

static inline bool watchdog_timeout_invalid(struct watchdog_device *wdd, unsigned int t)

static inline bool watchdog_timeout_invalid(struct watchdog_device *wdd, unsigned int t)

{

{

	return ((wdd->max_timeout != 0) &&

	/*

		(t < wdd->min_timeout || t > wdd->max_timeout));

	 * The timeout is invalid if

	 * - the requested value is smaller than the configured minimum timeout,

	 * or

	 * - a maximum timeout is configured, and the requested value is larger

	 *   than the maximum timeout.

	 */

	return t < wdd->min_timeout ||

		(wdd->max_timeout && t > wdd->max_timeout);

}

}





/* Use the following functions to manipulate watchdog driver specific data */

/* Use the following functions to manipulate watchdog driver specific data */