summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorWolfram Sang <wsa+renesas@sang-engineering.com>2019-04-19 20:15:49 +0200
committerWim Van Sebroeck <wim@linux-watchdog.org>2019-05-05 21:04:59 +0200
commitc7d30d42ff064f942fc3ad897543c4f69474f6d3 (patch)
treecb9b889f3009fa9507ba5aad639dbb62e00cd9b4 /drivers/watchdog
parent5429e3a5790ca387848167610e6184e1a9d06c26 (diff)
downloadlinux-c7d30d42ff064f942fc3ad897543c4f69474f6d3.tar.bz2
watchdog: cadence_wdt: still probe if user supplied timeout is invalid
We have a default timeout value in the driver which we will fall back to if the user supplied values are out of bounce. Reviewed-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/cadence_wdt.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/watchdog/cadence_wdt.c b/drivers/watchdog/cadence_wdt.c
index e6eaeaf3dfb1..a22f2d431a35 100644
--- a/drivers/watchdog/cadence_wdt.c
+++ b/drivers/watchdog/cadence_wdt.c
@@ -328,10 +328,7 @@ static int cdns_wdt_probe(struct platform_device *pdev)
/* Initialize the members of cdns_wdt structure */
cdns_wdt_device->parent = dev;
- ret = watchdog_init_timeout(cdns_wdt_device, wdt_timeout, dev);
- if (ret)
- return ret;
-
+ watchdog_init_timeout(cdns_wdt_device, wdt_timeout, dev);
watchdog_set_nowayout(cdns_wdt_device, nowayout);
watchdog_stop_on_reboot(cdns_wdt_device);
watchdog_set_drvdata(cdns_wdt_device, wdt);