patch-2.4.5 linux/drivers/char/i810-tco.c

Next file: linux/drivers/char/machzwd.c
Previous file: linux/drivers/char/epca.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.4/linux/drivers/char/i810-tco.c linux/drivers/char/i810-tco.c
@@ -181,8 +181,10 @@
 	/*
 	 *      Shut off the timer.
 	 */
+#ifdef CONFIG_WATCHDOG_NOWAYOUT
 	tco_timer_stop ();
 	timer_alive = 0;
+#endif	
 	return 0;
 }
 
@@ -213,7 +215,7 @@
 	};
 	switch (cmd) {
 	default:
-		return -ENOIOCTLCMD;
+		return -ENOTTY;
 	case WDIOC_GETSUPPORT:
 		if (copy_to_user
 		    ((struct watchdog_info *) arg, &ident, sizeof (ident)))

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