From e9d4e9831e5bd675be8735f455602b5292ff1b3d Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Thu, 7 Sep 2006 11:57:00 +0200
Subject: [PATCH] --- yaml --- r: 40240 b: refs/heads/master c:
 fa69afd3c224252890cb30864dc648d1399dd9fe h: refs/heads/master v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/char/watchdog/w83697hf_wdt.c | 27 +++++-----------------
 2 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/[refs] b/[refs]
index 3ba56c138084..0169ac3f6b3b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 089d8139f4c19c2f4d6984323e9d8a6e77cc92f7
+refs/heads/master: fa69afd3c224252890cb30864dc648d1399dd9fe
diff --git a/trunk/drivers/char/watchdog/w83697hf_wdt.c b/trunk/drivers/char/watchdog/w83697hf_wdt.c
index 2b3ce434c196..1ea43bf2c35d 100644
--- a/trunk/drivers/char/watchdog/w83697hf_wdt.c
+++ b/trunk/drivers/char/watchdog/w83697hf_wdt.c
@@ -120,29 +120,14 @@ w83697hf_deselect_wdt(void)
 	w83697hf_lock();
 }
 
-static void
-w83697hf_select_wd_register(void)
-{
-	w83697hf_unlock();
-
-	w83697hf_set_reg(0x29, 0x20);	/* Set pin 119 to WDTO# mode (= CR29, WDT0) */
-
-	w83697hf_set_reg(0x07, 0x08);	/* Switch to logic device 8 (GPIO2) */
-	w83697hf_set_reg(0x30, 0x01);	/* Enable timer/activate GPIO2 via bit 0 */
-}
-
-static void
-w83697hf_unselect_wd_register(void)
-{
-	w83697hf_lock();
-}
-
 static void
 w83697hf_init(void)
 {
 	unsigned char t;
 
-	w83697hf_select_wd_register();
+	w83697hf_select_wdt();
+
+	w83697hf_set_reg(0x29, 0x20);	/* Set pin 119 to WDTO# mode (= CR29, WDT0) */
 
 	t = w83697hf_get_reg(0xF3);	/* Read CRF3 */
 	if (t != 0) {
@@ -153,7 +138,7 @@ w83697hf_init(void)
 	t&=~0x0C;			/* set second mode & disable keyboard turning off watchdog */
 	w83697hf_set_reg(0xF4, t);	/* Write back to CRF4 */
 
-	w83697hf_unselect_wd_register();
+	w83697hf_deselect_wdt();
 }
 
 static int
@@ -412,6 +397,8 @@ wdt_init(void)
 	goto out;
 
 found:
+	w83697hf_init();
+	wdt_disable();	/* Disable watchdog until first use */
 
 	if (wdt_set_heartbeat(timeout)) {
 		wdt_set_heartbeat(WATCHDOG_TIMEOUT);
@@ -419,8 +406,6 @@ wdt_init(void)
 			WATCHDOG_TIMEOUT);
 	}
 
-	w83697hf_init();
-
 	ret = register_reboot_notifier(&wdt_notifier);
 	if (ret != 0) {
 		printk (KERN_ERR PFX "cannot register reboot notifier (err=%d)\n",