diff options
author | Viresh Kumar <viresh.kumar@st.com> | 2012-03-12 09:51:56 +0530 |
---|---|---|
committer | Wim Van Sebroeck <wim@iguana.be> | 2012-05-30 07:53:46 +0200 |
commit | 257f8c4aae392654d4ab846030b9f4518f16ed32 (patch) | |
tree | 54b97861301fa1097126f9d6d42633e835adff72 /drivers/watchdog/via_wdt.c | |
parent | 09a46e739780aab2eadf47afdefa70c9cd69d83d (diff) | |
download | linux-stable-257f8c4aae392654d4ab846030b9f4518f16ed32.tar.gz linux-stable-257f8c4aae392654d4ab846030b9f4518f16ed32.tar.bz2 linux-stable-257f8c4aae392654d4ab846030b9f4518f16ed32.zip |
watchdog: Add watchdog_active() routine
Some watchdog may need to check if watchdog is ACTIVE or not, for example in
their suspend/resume hooks.
This patch adds this routine and changes the core drivers to use it.
Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog/via_wdt.c')
-rw-r--r-- | drivers/watchdog/via_wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/via_wdt.c b/drivers/watchdog/via_wdt.c index 5603e31afdab..aa50da3ccfe3 100644 --- a/drivers/watchdog/via_wdt.c +++ b/drivers/watchdog/via_wdt.c @@ -91,7 +91,7 @@ static inline void wdt_reset(void) static void wdt_timer_tick(unsigned long data) { if (time_before(jiffies, next_heartbeat) || - (!test_bit(WDOG_ACTIVE, &wdt_dev.status))) { + (!watchdog_active(&wdt_dev))) { wdt_reset(); mod_timer(&timer, jiffies + WDT_HEARTBEAT); } else |