summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCorey Minyard <minyard@acm.org>2005-05-01 08:59:11 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-01 08:59:11 -0700
commitec26d79f4f5822283e0bffa44a542fd13c5146e4 (patch)
treea31a8aa6afa513bd35ed1a5b5e233c6a64fe1c90
parent35bc37a0e0979a091bcf5d9161ffe935b3aa998c (diff)
[PATCH] ipmi: fix watchdog so the device can be reopened on an unexpected close
If there is an unexpected close, still allow the watchdog interface to be re-opened on the IPMI watchdog. Signed-off-by: Corey Minyard <minyard@acm.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/char/ipmi/ipmi_watchdog.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c
index fd7093879c66..fcd1c02a32cb 100644
--- a/drivers/char/ipmi/ipmi_watchdog.c
+++ b/drivers/char/ipmi/ipmi_watchdog.c
@@ -709,11 +709,11 @@ static int ipmi_close(struct inode *ino, struct file *filep)
if (expect_close == 42) {
ipmi_watchdog_state = WDOG_TIMEOUT_NONE;
ipmi_set_timeout(IPMI_SET_TIMEOUT_NO_HB);
- clear_bit(0, &ipmi_wdog_open);
} else {
printk(KERN_CRIT PFX "Unexpected close, not stopping watchdog!\n");
ipmi_heartbeat();
}
+ clear_bit(0, &ipmi_wdog_open);
}
ipmi_fasync (-1, filep, 0);