diff options
| author | Pratyush Anand <panand@redhat.com> | 2016-05-31 08:08:10 +0200 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2016-07-17 20:59:47 +0200 |
| commit | c3c1e29c8ad11dec67d01203759272da0d0df3aa (patch) | |
| tree | 71980287cd7cdf78192e3444aa3442d7ff2afa30 /drivers/watchdog/sbsa_gwdt.c | |
| parent | watchdog: sbsa: Use max_hw_heartbeat_ms instead of max_timeout (diff) | |
| download | linux-c3c1e29c8ad11dec67d01203759272da0d0df3aa.tar.xz linux-c3c1e29c8ad11dec67d01203759272da0d0df3aa.zip | |
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/sbsa_gwdt.c')
| -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) dev_warn(dev, "System reset by WDT.\n"); wdd->bootstatus |= WDIOF_CARDRESET; } + if (status & SBSA_GWDT_WCS_EN) + set_bit(WDOG_HW_RUNNING, &wdd->status); if (action) { irq = platform_get_irq(pdev, 0); |