diff options
author | Pratyush Anand <panand@redhat.com> | 2016-05-31 02:08:10 -0400 |
---|---|---|
committer | Wim Van Sebroeck <wim@iguana.be> | 2016-07-17 14:59:47 -0400 |
commit | c3c1e29c8ad11dec67d01203759272da0d0df3aa (patch) | |
tree | 71980287cd7cdf78192e3444aa3442d7ff2afa30 /drivers/watchdog | |
parent | e05e80eb58cc9679d0ff8de5af095a66ba855e10 (diff) |
watchdog: sbsa: Set WDOG_HW_RUNNING, when watchdog is already running.
This patch uses the new flag WDOG_HW_RUNNING in driver.
According to the definition of this flag, it should be set,
if watchdog is running after booting, before it's opened.
Signed-off-by: Pratyush Anand <panand@redhat.com>
Signed-off-by: Fu Wei <fu.wei@linaro.org>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
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/sbsa_gwdt.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/watchdog/sbsa_gwdt.c b/drivers/watchdog/sbsa_gwdt.c index 6af71e07f309..cc885f1c1850 100644 --- a/drivers/watchdog/sbsa_gwdt.c +++ b/drivers/watchdog/sbsa_gwdt.c | |||
@@ -283,6 +283,8 @@ static int sbsa_gwdt_probe(struct platform_device *pdev) | |||
283 | dev_warn(dev, "System reset by WDT.\n"); | 283 | dev_warn(dev, "System reset by WDT.\n"); |
284 | wdd->bootstatus |= WDIOF_CARDRESET; | 284 | wdd->bootstatus |= WDIOF_CARDRESET; |
285 | } | 285 | } |
286 | if (status & SBSA_GWDT_WCS_EN) | ||
287 | set_bit(WDOG_HW_RUNNING, &wdd->status); | ||
286 | 288 | ||
287 | if (action) { | 289 | if (action) { |
288 | irq = platform_get_irq(pdev, 0); | 290 | irq = platform_get_irq(pdev, 0); |