patch-2.1.127 linux/drivers/char/istallion.c

Next file: linux/drivers/char/lp.c
Previous file: linux/drivers/char/ftape/lowlevel/ftape-io.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.126/linux/drivers/char/istallion.c linux/drivers/char/istallion.c
@@ -1292,8 +1292,7 @@
 #endif
 	if (len > 0) {
 		current->state = TASK_INTERRUPTIBLE;
-		current->timeout = jiffies + len;
-		schedule();
+		schedule_timeout(len);
 		current->state = TASK_RUNNING;
 	}
 }
@@ -2252,7 +2251,8 @@
 {
 	stlibrd_t	*brdp;
 	stliport_t	*portp;
-	long		arg, savestate, savetime;
+	long		arg;
+	/* long savestate, savetime; */
 
 #if DEBUG
 	printk("stli_breakctl(tty=%x,state=%d)\n", (int) tty, state);
@@ -2272,15 +2272,18 @@
 /*
  *	Due to a bug in the tty send_break() code we need to preserve
  *	the current process state and timeout...
- */
 	savetime = current->timeout;
 	savestate = current->state;
+ */
 
 	arg = (state == -1) ? BREAKON : BREAKOFF;
 	stli_cmdwait(brdp, portp, A_BREAK, &arg, sizeof(long), 0);
 
+/*
+ *
 	current->timeout = savetime;
 	current->state = savestate;
+ */
 }
 
 /*****************************************************************************/

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov