patch-2.3.16 linux/drivers/char/synclink.c

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

diff -u --recursive --new-file v2.3.15/linux/drivers/char/synclink.c linux/drivers/char/synclink.c
@@ -3413,7 +3413,6 @@
 	if ( info->params.mode == MGSL_MODE_HDLC ) {
 		while (info->tx_active) {
 			current->state = TASK_INTERRUPTIBLE;
-			current->counter = 0;   /* make us low-priority */
 			schedule_timeout(char_time);
 			if (signal_pending(current))
 				break;
@@ -3424,7 +3423,6 @@
 		while (!(usc_InReg(info,TCSR) & TXSTATUS_ALL_SENT) &&
 			info->tx_enabled) {
 			current->state = TASK_INTERRUPTIBLE;
-			current->counter = 0;   /* make us low-priority */
 			schedule_timeout(char_time);
 			if (signal_pending(current))
 				break;
@@ -3561,7 +3559,7 @@
 			spin_unlock_irqrestore(&info->irq_spinlock,flags);
 		}
 		
-		current->state = TASK_INTERRUPTIBLE;
+		set_current_state(TASK_INTERRUPTIBLE);
 		
 		if (tty_hung_up_p(filp) || !(info->flags & ASYNC_INITIALIZED)){
 			retval = (info->flags & ASYNC_HUP_NOTIFY) ?

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