git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[safe/jmp/linux-2.6]
/
drivers
/
watchdog
/
max63xx_wdt.c
diff --git
a/drivers/watchdog/max63xx_wdt.c
b/drivers/watchdog/max63xx_wdt.c
index
75f3a83
..
3053ff0
100644
(file)
--- a/
drivers/watchdog/max63xx_wdt.c
+++ b/
drivers/watchdog/max63xx_wdt.c
@@
-154,9
+154,14
@@
static void max63xx_wdt_enable(struct max63xx_timeout *entry)
static void max63xx_wdt_disable(void)
{
+ u8 val;
+
spin_lock(&io_lock);
- __raw_writeb(3, wdt_base);
+ val = __raw_readb(wdt_base);
+ val &= ~MAX6369_WDSET;
+ val |= 3;
+ __raw_writeb(val, wdt_base);
spin_unlock(&io_lock);