Commit 1894cad9 authored May 31, 2016 by Pratyush Anand Committed by Wim Van Sebroeck Jul 17, 2016

watchdog: skip min and max timeout validity check when max_hw_heartbeat_ms is defined



When max_hw_heartbeat_ms has a none zero value, max_timeout is not used.
So it's value can be 0. In such case if a driver uses min_timeout
functionality, then check will always fail.

This patch fixes above issue.

Signed-off-by: Pratyush Anand <panand@redhat.com>
Signed-off-by: Fu Wei <fu.wei@linaro.org>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

parent b7a8c420

drivers/watchdog/watchdog_core.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -88,7 +88,7 @@ static void watchdog_check_min_max_timeout(struct watchdog_device *wdd)
		* Check that we have valid min and max timeout values, if
		* not reset them both to 0 (=not used or unknown)
		*/
		if (wdd->min_timeout > wdd->max_timeout) {
		if (!wdd->max_hw_heartbeat_ms && wdd->min_timeout > wdd->max_timeout) {
		pr_info("Invalid min and max timeout values, resetting to 0!\n");
		wdd->min_timeout = 0;
		wdd->max_timeout = 0;