[<prev] [next>] [day] [month] [year] [list]
Message-Id: <20190416102515.12269-5-wsa+renesas@sang-engineering.com>
Date: Tue, 16 Apr 2019 12:25:03 +0200
From: Wolfram Sang <wsa+renesas@...g-engineering.com>
To: linux-watchdog@...r.kernel.org
Cc: linux-renesas-soc@...r.kernel.org,
Guenter Roeck <linux@...ck-us.net>,
Wolfram Sang <wsa+renesas@...g-engineering.com>,
Wim Van Sebroeck <wim@...ux-watchdog.org>,
linux-kernel@...r.kernel.org
Subject: [PATCH v2 04/16] 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@...ck-us.net>
Signed-off-by: Wolfram Sang <wsa+renesas@...g-engineering.com>
---
drivers/watchdog/cadence_wdt.c | 5 +----
1 file changed, 1 insertion(+), 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);
--
2.11.0
Powered by blists - more mailing lists