diff options
Diffstat (limited to 'drivers/watchdog/cadence_wdt.c')
| -rw-r--r-- | drivers/watchdog/cadence_wdt.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/watchdog/cadence_wdt.c b/drivers/watchdog/cadence_wdt.c index f8d4e91d0383..3b310768fbbf 100644 --- a/drivers/watchdog/cadence_wdt.c +++ b/drivers/watchdog/cadence_wdt.c @@ -2,7 +2,7 @@ /* * Cadence WDT driver - Used by Xilinx Zynq * - * Copyright (C) 2010 - 2014 Xilinx, Inc. + * Copyright (C) 2010 - 2019 Xilinx, Inc. * */ @@ -328,15 +328,20 @@ static int cdns_wdt_probe(struct platform_device *pdev) /* Initialize the members of cdns_wdt structure */ cdns_wdt_device->parent = dev; - watchdog_init_timeout(cdns_wdt_device, wdt_timeout, dev); + ret = watchdog_init_timeout(cdns_wdt_device, wdt_timeout, dev); + if (ret) + dev_warn(&pdev->dev, "unable to set timeout value\n"); + watchdog_set_nowayout(cdns_wdt_device, nowayout); watchdog_stop_on_reboot(cdns_wdt_device); watchdog_set_drvdata(cdns_wdt_device, wdt); wdt->clk = devm_clk_get(dev, NULL); if (IS_ERR(wdt->clk)) { - dev_err(dev, "input clock not found\n"); - return PTR_ERR(wdt->clk); + ret = PTR_ERR(wdt->clk); + if (ret != -EPROBE_DEFER) + dev_err(&pdev->dev, "input clock not found\n"); + return ret; } ret = clk_prepare_enable(wdt->clk); |