[WATCHDOG] v2.6.25 watchdog fix

[Wim Van Sebroeck]

Hi Linus,

Please pull from 'master' branch of
	git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git
or if master.kernel.org hasn't synced up yet:
	master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git

This will update the following files:

 drivers/watchdog/it8712f_wdt.c |    2 ++
 1 file changed, 2 insertions(+)

with these Changes:

Author: Andrew Paprocki <andrew@xxxxxxxxxxx>
Date:   Wed Apr 2 02:43:19 2008 -0400

    [WATCHDOG] it8712f_wdt Zero MSB timeout byte when disabling watchdog
    
    I noticed this while testing the latest code. I'm not sure if it is required,
    but the normal (or LSB) timeout value is set to zero, so the MSB should
    be as well to stay consistent.
    
    If the chip revision is >= 8, set MSB of the 16-bit timeout value to zero
    when disabling the watchdog in it8712f_wdt_disable().
    
    Signed-off-by: Andrew Paprocki <andrew@xxxxxxxxxxx>
    Signed-off-by: Wim Van Sebroeck <wim@xxxxxxxxx>
    Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>

The Changes can also be looked at on:
	http://www.kernel.org/git/?p=linux/kernel/git/wim/linux-2.6-watchdog.git;a=summary

For completeness, I added the overal diff below.

Greetings,
Wim.

================================================================================
diff --git a/drivers/watchdog/it8712f_wdt.c b/drivers/watchdog/it8712f_wdt.c
index ca90c51..445b7e8 100644
--- a/drivers/watchdog/it8712f_wdt.c
+++ b/drivers/watchdog/it8712f_wdt.c
@@ -200,6 +200,8 @@ it8712f_wdt_disable(void)
 
 	superio_outb(0, WDT_CONFIG);
 	superio_outb(0, WDT_CONTROL);
+	if (revision >= 0x08)
+		superio_outb(0, WDT_TIMEOUT + 1);
 	superio_outb(0, WDT_TIMEOUT);
 
 	superio_exit();
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/