From c9e1e2b91c9c1ba5370d30c7acda37c0594eec36 Mon Sep 17 00:00:00 2001 From: Timo Juhani Lindfors Date: Thu, 30 Sep 2010 17:08:04 +0300 Subject: [PATCH] --- yaml --- r: 220564 b: refs/heads/master c: a422088db21333ba02a0f4fe4f5abfb08c802d35 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/watchdog/it8712f_wdt.c | 13 +++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 86afeafacc2b..13b59915c9e6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f0fc10745a48c766ea5d6d83a6a371a223986bb0 +refs/heads/master: a422088db21333ba02a0f4fe4f5abfb08c802d35 diff --git a/trunk/drivers/watchdog/it8712f_wdt.c b/trunk/drivers/watchdog/it8712f_wdt.c index b08fae65bb0e..b32c6c045b1a 100644 --- a/trunk/drivers/watchdog/it8712f_wdt.c +++ b/trunk/drivers/watchdog/it8712f_wdt.c @@ -85,6 +85,14 @@ static unsigned short address; #define WDT_OUT_PWROK 0x10 /* Pulse PWROK on timeout */ #define WDT_OUT_KRST 0x40 /* Pulse reset on timeout */ +static int wdt_control_reg = WDT_RESET_GAME; +module_param(wdt_control_reg, int, 0); +MODULE_PARM_DESC(wdt_control_reg, "Value to write to watchdog control " + "register. The default WDT_RESET_GAME resets the timer on " + "game port reads that this driver generates. You can also " + "use KBD, MOUSE or CIR if you have some external way to " + "generate those interrupts."); + static int superio_inb(int reg) { outb(reg, REG); @@ -131,7 +139,8 @@ static inline void superio_exit(void) static inline void it8712f_wdt_ping(void) { - inb(address); + if (wdt_control_reg & WDT_RESET_GAME) + inb(address); } static void it8712f_wdt_update_margin(void) @@ -170,7 +179,7 @@ static void it8712f_wdt_enable(void) superio_enter(); superio_select(LDN_GPIO); - superio_outb(WDT_RESET_GAME, WDT_CONTROL); + superio_outb(wdt_control_reg, WDT_CONTROL); it8712f_wdt_update_margin();