diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2006-09-07 05:57:00 -0400 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2006-10-04 16:44:47 -0400 |
| commit | fe851ebade80af9b58599c74d61718657b02cfd3 (patch) | |
| tree | 727f5c2531b6747397eab8f1d1ed02070c0332db | |
| parent | f7be3328b6e8b09b3a910a93ef569cba162ea81d (diff) | |
[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>
| -rw-r--r-- | drivers/char/watchdog/w83697hf_wdt.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/char/watchdog/w83697hf_wdt.c b/drivers/char/watchdog/w83697hf_wdt.c index b1f225798500..6a357a818c8a 100644 --- a/drivers/char/watchdog/w83697hf_wdt.c +++ b/drivers/char/watchdog/w83697hf_wdt.c | |||
| @@ -76,6 +76,12 @@ w83697hf_unlock(void) | |||
| 76 | outb_p(0x87, W83697HF_EFER); /* Again according to manual */ | 76 | outb_p(0x87, W83697HF_EFER); /* Again according to manual */ |
| 77 | } | 77 | } |
| 78 | 78 | ||
| 79 | static inline void | ||
| 80 | w83697hf_lock(void) | ||
| 81 | { | ||
| 82 | outb_p(0xAA, W83697HF_EFER); /* Leave extended function mode */ | ||
| 83 | } | ||
| 84 | |||
| 79 | static void | 85 | static void |
| 80 | w83697hf_select_wd_register(void) | 86 | w83697hf_select_wd_register(void) |
| 81 | { | 87 | { |
| @@ -93,7 +99,7 @@ w83697hf_select_wd_register(void) | |||
| 93 | static void | 99 | static void |
| 94 | w83697hf_unselect_wd_register(void) | 100 | w83697hf_unselect_wd_register(void) |
| 95 | { | 101 | { |
| 96 | outb_p(0xAA, W83697HF_EFER); /* Leave extended function mode */ | 102 | w83697hf_lock(); |
| 97 | } | 103 | } |
| 98 | 104 | ||
| 99 | static void | 105 | static void |
