From: Jan Beulich Date: Mon, 19 Mar 2012 09:32:28 +0000 (+0000) Subject: watchdog: xen: don't clear is_active when xen_wdt_stop() failed X-Git-Tag: v3.4-rc1~67^2~14 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=38c484fa136f66224694af298f80e96bf4072700;p=linux.git watchdog: xen: don't clear is_active when xen_wdt_stop() failed xen_wdt_release() shouldn't clear is_active even when the watchdog didn't get stopped (which by itself shouldn't happen, but let's return a proper error in this case rather than adding a BUG() upon hypercall failure). Signed-off-by: Jan Beulich Signed-off-by: Wim Van Sebroeck --- diff --git a/drivers/watchdog/xen_wdt.c b/drivers/watchdog/xen_wdt.c index e04fd6cf2121..e4a25b51165c 100644 --- a/drivers/watchdog/xen_wdt.c +++ b/drivers/watchdog/xen_wdt.c @@ -132,15 +132,17 @@ static int xen_wdt_open(struct inode *inode, struct file *file) static int xen_wdt_release(struct inode *inode, struct file *file) { + int err = 0; + if (expect_release) - xen_wdt_stop(); + err = xen_wdt_stop(); else { pr_crit("unexpected close, not stopping watchdog!\n"); xen_wdt_kick(); } - is_active = false; + is_active = err; expect_release = false; - return 0; + return err; } static ssize_t xen_wdt_write(struct file *file, const char __user *data,