projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f9f535c)
watchdog: tangox: Mark running watchdog correctly
authorGuenter Roeck <linux@roeck-us.net>
Fri, 27 May 2016 22:28:00 +0000 (15:28 -0700)
committerWim Van Sebroeck <wim@iguana.be>
Sun, 17 Jul 2016 19:00:26 +0000 (21:00 +0200)
A running watchdog is marked with WDOG_HW_RUNNING, not with WDOG_ACTIVE.
WDOG_ACTIVE indicates that the watchdog device has been opened from user
space.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
drivers/watchdog/tangox_wdt.c patch | blob | blame | history

diff --git a/drivers/watchdog/tangox_wdt.c b/drivers/watchdog/tangox_wdt.c
index cfbed7e051b619f5edec8c93a3b964373d9b9e0f..e7a5d0fc81d4960dadde5459247bf6f251bbd2f7 100644 (file)
--- a/drivers/watchdog/tangox_wdt.c
+++ b/drivers/watchdog/tangox_wdt.c
@@ -170,7 +170,7 @@ static int tangox_wdt_probe(struct platform_device *pdev)
         * already running.
         */
        if (readl(dev->base + WD_COUNTER)) {
-               set_bit(WDOG_ACTIVE, &dev->wdt.status);
+               set_bit(WDOG_HW_RUNNING, &dev->wdt.status);
                tangox_wdt_start(&dev->wdt);
        }