diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-06-19 03:25:08 +0300 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-06-19 03:25:08 +0300 |
| commit | 6ea24cf79e055f0a62a64baa8587e2254a493c7b (patch) | |
| tree | c5cd6113ed93854b1bc30cd471c366f080c4be2f /drivers/watchdog/atlas7_wdt.c | |
| parent | 540c26087bfbad6ea72758b76b16ae6282a73fea (diff) | |
| parent | 488326947cd1f038da8d2c9068a0d07b913b7983 (diff) | |
| download | linux-6ea24cf79e055f0a62a64baa8587e2254a493c7b.tar.xz | |
Merge branch 'cec-defines' into for-linus
Let's bring in HDMI CEC defines to ease merging CEC support in the next
merge window.
Diffstat (limited to 'drivers/watchdog/atlas7_wdt.c')
| -rw-r--r-- | drivers/watchdog/atlas7_wdt.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/watchdog/atlas7_wdt.c b/drivers/watchdog/atlas7_wdt.c index df6d9242a319..ed80734befae 100644 --- a/drivers/watchdog/atlas7_wdt.c +++ b/drivers/watchdog/atlas7_wdt.c @@ -154,6 +154,11 @@ static int atlas7_wdt_probe(struct platform_device *pdev) writel(0, wdt->base + ATLAS7_WDT_CNT_CTRL); wdt->tick_rate = clk_get_rate(clk); + if (!wdt->tick_rate) { + ret = -EINVAL; + goto err1; + } + wdt->clk = clk; atlas7_wdd.min_timeout = 1; atlas7_wdd.max_timeout = UINT_MAX / wdt->tick_rate; |