---

yaml --- r: 40233 b: refs/heads/master c: f7be332 h: refs/heads/master i: 40231: d940ae4 v: v3
git-mirror · Oct 4, 2006 · cbe2761 · cbe2761
1 parent c075de5
commit cbe2761
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de710d6871c7f569da007f1074710fadf1708c29
+refs/heads/master: f7be3328b6e8b09b3a910a93ef569cba162ea81d
diff --git a/trunk/drivers/char/watchdog/w83697hf_wdt.c b/trunk/drivers/char/watchdog/w83697hf_wdt.c
@@ -69,11 +69,17 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CON
 #define W83697HF_EFIR (wdt_io+0)	/* Extended Function Index Register (same as EFER) */
 #define W83697HF_EFDR (wdt_io+1)	/* Extended Function Data Register */
 
-static void
-w83697hf_select_wd_register(void)
+static inline void
+w83697hf_unlock(void)
 {
 	outb_p(0x87, W83697HF_EFER);	/* Enter extended function mode */
 	outb_p(0x87, W83697HF_EFER);	/* Again according to manual */
+}
+
+static void
+w83697hf_select_wd_register(void)
+{
+	w83697hf_unlock();
 
 	outb_p(0x29, W83697HF_EFER);	/* select CR29 */
 	outb_p(0x20, W83697HF_EFDR);	/* select WDTO */