From mboxrd@z Thu Jan 1 00:00:00 1970 From: fu.wei@linaro.org (fu.wei at linaro.org) Date: Tue, 31 May 2016 14:08:10 +0800 Subject: [PATCH 3/3] sbsa_gwdt: Set WDOG_HW_RUNNING, when watchdog is already running. In-Reply-To: <1464674890-10512-1-git-send-email-fu.wei@linaro.org> References: <1464674890-10512-1-git-send-email-fu.wei@linaro.org> Message-ID: <1464674890-10512-4-git-send-email-fu.wei@linaro.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org From: Pratyush Anand 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 Signed-off-by: Fu Wei --- drivers/watchdog/sbsa_gwdt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/watchdog/sbsa_gwdt.c b/drivers/watchdog/sbsa_gwdt.c index 6af71e0..cc885f1 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); -- 2.5.5