From a3e376d26ace6d823f7aa4c63476e7089a6196df Mon Sep 17 00:00:00 2001 From: Guenter Roeck Date: Fri, 27 May 2016 15:28:00 -0700 Subject: [PATCH] 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 Signed-off-by: Wim Van Sebroeck --- drivers/watchdog/tangox_wdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); }