[WATCHDOG] w83697hf/hg WDT driver - patch 8

This is patch 8 in the series of patches that converts
Marcus Junker's w83697hf watchdog driver to Samuel Tardieau's
w83697hf/hg watchdog driver.

This patch contains following changes:
 - add w83697hf_lock function to leave the
   chipsets extended function mode.

Signed-off-by: Samuel Tardieu <sam@rfc1149.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

diff --git a/drivers/char/watchdog/w83697hf_wdt.c b/drivers/char/watchdog/w83697hf_wdt.c
index b1f2257..6a357a8 100644 (file)
--- a/drivers/char/watchdog/w83697hf_wdt.c
+++ b/drivers/char/watchdog/w83697hf_wdt.c
@@ -76,6 +76,12 @@ w83697hf_unlock(void)
        outb_p(0x87, W83697HF_EFER);    /* Again according to manual */
 }
 
+static inline void
+w83697hf_lock(void)
+{
+       outb_p(0xAA, W83697HF_EFER);    /* Leave extended function mode */
+}
+
 static void
 w83697hf_select_wd_register(void)
 {
@@ -93,7 +99,7 @@ w83697hf_select_wd_register(void)
 static void
 w83697hf_unselect_wd_register(void)
 {
-       outb_p(0xAA, W83697HF_EFER);    /* Leave extended function mode */
+       w83697hf_lock();
 }
 
 static void