diff options
author | Guenter Roeck <linux@roeck-us.net> | 2016-05-27 15:28:00 -0700 |
---|---|---|
committer | Wim Van Sebroeck <wim@iguana.be> | 2016-07-17 21:00:26 +0200 |
commit | a3e376d26ace6d823f7aa4c63476e7089a6196df (patch) | |
tree | 79187abf082392fae8ff6112d1d8e51e96575ebc /drivers/watchdog | |
parent | f9f535c1b76128f94dae7a4bb41464aacd4c10ec (diff) | |
download | op-kernel-dev-a3e376d26ace6d823f7aa4c63476e7089a6196df.zip op-kernel-dev-a3e376d26ace6d823f7aa4c63476e7089a6196df.tar.gz |
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>
Diffstat (limited to 'drivers/watchdog')
-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 cfbed7e..e7a5d0f 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); } |