From: Guenter Roeck <linux@roeck-us.net>
Date: Fri, 27 May 2016 22:28:00 +0000 (-0700)
Subject: watchdog: tangox: Mark running watchdog correctly
X-Git-Tag: v4.8-rc1~82^2~32
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=a3e376d26ace6d823f7aa4c63476e7089a6196df;p=cascardo%2Flinux.git

watchdog: tangox: Mark running watchdog correctly

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>
---

diff --git a/drivers/watchdog/tangox_wdt.c b/drivers/watchdog/tangox_wdt.c
index cfbed7e051b6..e7a5d0fc81d4 100644
--- 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);
 	}