diff options
| author |   Guenter Roeck <linux@roeck-us.net> | 2016-07-17 13:47:47 -0700 |
|---|---|---|
| committer |   Wim Van Sebroeck <wim@iguana.be> | 2016-07-18 12:10:21 +0200 |
| commit | c7ef68c32265a396a4d977f896a11a4cebb0ace4 (patch) | |
| tree | 08d0c66fd16576179bca2a838a1e7e7d9e48918f /drivers/watchdog/tangox_wdt.c | |
| parent | watchdog: change watchdog_need_worker logic (diff) | |
| download | linux-dev-c7ef68c32265a396a4d977f896a11a4cebb0ace4.tar.xz linux-dev-c7ef68c32265a396a4d977f896a11a4cebb0ace4.zip | |
watchdog: tangox: Set max_hw_heartbeat_ms instead of max_timeout
Setting max_hw_heartbeat_ms lets the watchdog core provide a virtual
timeout if the timeout requested by user space is larger than the maximum
hardware timeout. Also, it helps the watchdog core to provide heartbeats
if the hardware watchdog is running while closed.
Fixes: a3e376d26ace ("watchdog: tangox: Mark running watchdog correctly")
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog/tangox_wdt.c')
| -rw-r--r-- | drivers/watchdog/tangox_wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/tangox_wdt.c b/drivers/watchdog/tangox_wdt.c index e7a5d0fc81d4..202c4b9cc921 100644 --- a/drivers/watchdog/tangox_wdt.c +++ b/drivers/watchdog/tangox_wdt.c @@ -149,7 +149,7 @@ static int tangox_wdt_probe(struct platform_device *pdev) dev->wdt.ops = &tangox_wdt_ops; dev->wdt.timeout = DEFAULT_TIMEOUT; dev->wdt.min_timeout = 1; - dev->wdt.max_timeout = (U32_MAX - 1) / dev->clk_rate; + dev->wdt.max_hw_heartbeat_ms = (U32_MAX - 1) / dev->clk_rate; watchdog_init_timeout(&dev->wdt, timeout, &pdev->dev); watchdog_set_nowayout(&dev->wdt, nowayout); |