From 95c3bed35d526b31d11c3beda122f49cb65b4fd2 Mon Sep 17 00:00:00 2001 From: Wim Van Sebroeck Date: Mon, 8 Mar 2010 11:02:38 +0000 Subject: [PATCH] --- yaml --- r: 187039 b: refs/heads/master c: 39f3be72c1a1b20d7e6e35717afa2ddb89259650 h: refs/heads/master i: 187037: 86e4350000238c87ddd621ceb95da8e74cc51d27 187035: 112e299395da077ee412e97256890c083f1c54cc 187031: 131bc31968167cf3633faef93991a8f2896d050b 187023: 20ffd96275bb8acac46521de079914ad1fc3ea0d 187007: 1e27aab70eccb6a3339db61b82f7afdd88dd631e v: v3 --- [refs] | 2 +- trunk/drivers/watchdog/i6300esb.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 7b8065e80871..f254f01bedac 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c1bf3acffcddcf794e3d8a1d25fb8bd4d5912383 +refs/heads/master: 39f3be72c1a1b20d7e6e35717afa2ddb89259650 diff --git a/trunk/drivers/watchdog/i6300esb.c b/trunk/drivers/watchdog/i6300esb.c index 2fbe7fea7ee6..3e00dc5b5a20 100644 --- a/trunk/drivers/watchdog/i6300esb.c +++ b/trunk/drivers/watchdog/i6300esb.c @@ -65,7 +65,7 @@ /* Config register bits */ #define ESB_WDT_REBOOT (0x01 << 5) /* Enable reboot on timeout */ #define ESB_WDT_FREQ (0x01 << 2) /* Decrement frequency */ -#define ESB_WDT_INTTYPE (0x11 << 0) /* Interrupt type on timer1 timeout */ +#define ESB_WDT_INTTYPE (0x03 << 0) /* Interrupt type on timer1 timeout */ /* Reload register bits */ #define ESB_WDT_TIMEOUT (0x01 << 9) /* Watchdog timed out */ @@ -111,8 +111,8 @@ MODULE_PARM_DESC(nowayout, */ static inline void esb_unlock_registers(void) { - writeb(ESB_UNLOCK1, ESB_RELOAD_REG); - writeb(ESB_UNLOCK2, ESB_RELOAD_REG); + writew(ESB_UNLOCK1, ESB_RELOAD_REG); + writew(ESB_UNLOCK2, ESB_RELOAD_REG); } static int esb_timer_start(void)