Commit 96505abd authored by Romain Izard's avatar Romain Izard Committed by Greg Kroah-Hartman

watchdog: sama5d4: fix timeout-sec usage

[ Upstream commit 2e0432f8 ]

When using watchdog_init_timeout to update the default timeout value,
an error means that there is no "timeout-sec" in the relevant device
tree node.

This should not prevent binding of the driver to the device.

Fixes: 976932e4 ("watchdog: sama5d4: make use of timeout-secs provided in devicetree")
Signed-off-by: default avatarRomain Izard <romain.izard.pro@gmail.com>
Reviewed-by: default avatarMarcus Folkesson <marcus.folkesson@gmail.com>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarWim Van Sebroeck <wim@linux-watchdog.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 26d6e542
...@@ -247,11 +247,7 @@ static int sama5d4_wdt_probe(struct platform_device *pdev) ...@@ -247,11 +247,7 @@ static int sama5d4_wdt_probe(struct platform_device *pdev)
} }
} }
ret = watchdog_init_timeout(wdd, wdt_timeout, &pdev->dev); watchdog_init_timeout(wdd, wdt_timeout, &pdev->dev);
if (ret) {
dev_err(&pdev->dev, "unable to set timeout value\n");
return ret;
}
timeout = WDT_SEC2TICKS(wdd->timeout); timeout = WDT_SEC2TICKS(wdd->timeout);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment