]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
watchdog: tangox: Set max_hw_heartbeat_ms instead of max_timeout
authorGuenter Roeck <linux@roeck-us.net>
Sun, 17 Jul 2016 20:47:47 +0000 (13:47 -0700)
committerWim Van Sebroeck <wim@iguana.be>
Mon, 18 Jul 2016 10:10:21 +0000 (12:10 +0200)
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>
drivers/watchdog/tangox_wdt.c

index e7a5d0fc81d4960dadde5459247bf6f251bbd2f7..202c4b9cc9212b779c9bc2145bbb9bac503c6cf6 100644 (file)
@@ -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);