---

yaml --- r: 40234 b: refs/heads/master c: fe851eb h: refs/heads/master v: v3
git-mirror · Oct 4, 2006 · d597b8c · d597b8c
1 parent cbe2761
commit d597b8c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7be3328b6e8b09b3a910a93ef569cba162ea81d
+refs/heads/master: fe851ebade80af9b58599c74d61718657b02cfd3
diff --git a/trunk/drivers/char/watchdog/w83697hf_wdt.c b/trunk/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