[PATCH v2 4/6] watchdog: set some reasonable timeout_max value if no other is available

Oleksij Rempel o.rempel at pengutronix.de
Tue Mar 13 01:33:26 PDT 2018


Some drivers do not provide timeout_max value.
Using some value is probably better then setting timeout_max to 0.

Signed-off-by: Oleksij Rempel <o.rempel at pengutronix.de>
---
 drivers/watchdog/wd_core.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/watchdog/wd_core.c b/drivers/watchdog/wd_core.c
index 0dc7aecf3..31a88a377 100644
--- a/drivers/watchdog/wd_core.c
+++ b/drivers/watchdog/wd_core.c
@@ -59,8 +59,14 @@ int watchdog_register(struct watchdog *wd)
 	if (!wd->priority)
 		wd->priority = WATCHDOG_DEFAULT_PRIORITY;
 
-	dev_add_param_uint32_ro(&wd->dev, "timeout_max",
+	/* set some default sane value */
+	if (!wd->timeout_max)
+		wd->timeout_max = 60 * 60 * 24;
+
+	p = dev_add_param_uint32_ro(&wd->dev, "timeout_max",
 			&wd->timeout_max, "%u");
+	if (IS_ERR(p))
+		return PTR_ERR(p);
 
 	list_add_tail(&wd->list, &watchdog_list);
 
-- 
2.16.1




More information about the barebox mailing list