From cbe2761b916a08aa9ddb38dd30449826682a20d3 Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Thu, 7 Sep 2006 11:57:00 +0200 Subject: [PATCH] --- yaml --- r: 40233 b: refs/heads/master c: f7be3328b6e8b09b3a910a93ef569cba162ea81d h: refs/heads/master i: 40231: d940ae4ec49d60c27abb264c01b5013d27401d15 v: v3 --- [refs] | 2 +- trunk/drivers/char/watchdog/w83697hf_wdt.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 45a8d7f0fb5c..6ae538b61c93 100644 --- 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 index ad397f912bd4..b1f225798500 100644 --- 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 */