patch-2.4.23 linux-2.4.23/drivers/char/softdog.c

Next file: linux-2.4.23/drivers/char/sonypi.c
Previous file: linux-2.4.23/drivers/char/sn_serial.c
Back to the patch index
Back to the overall index

diff -urN linux-2.4.22/drivers/char/softdog.c linux-2.4.23/drivers/char/softdog.c
@@ -124,7 +124,7 @@
 	 *	Shut off the timer.
 	 * 	Lock it in if it's a module and we set nowayout
 	 */
-	if (expect_close) {
+	if (expect_close || nowayout == 0) {
 		del_timer(&watchdog_ticktock);
 	} else {
 		printk(KERN_CRIT "SOFTDOG: WDT device closed unexpectedly.  WDT will not stop!\n");

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)