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

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

diff -u --recursive --new-file v2.1.126/linux/drivers/char/msp3400.c linux/drivers/char/msp3400.c
@@ -554,8 +554,7 @@
 			UNLOCK_I2C_BUS(msp->bus);
 
 			current->state = TASK_INTERRUPTIBLE;
-			current->timeout = jiffies + HZ/25;
-			schedule();
+			schedule_timeout(HZ/25);
 			if (signal_pending(current))
 				goto done;
 			if (msp->restart) {
@@ -589,8 +588,7 @@
 			UNLOCK_I2C_BUS(msp->bus);
 
 			current->state = TASK_INTERRUPTIBLE;
-			current->timeout = jiffies + HZ/25;
-			schedule();
+			schedule_timeout(HZ/25);
 			if (signal_pending(current))
 				goto done;
 			if (msp->restart) {
@@ -715,8 +713,7 @@
 
 		/* wait 1 sec */
 		current->state = TASK_INTERRUPTIBLE;
-		current->timeout = jiffies + HZ;
-		schedule();
+		schedule_timeout(HZ);
 		if (signal_pending(current))
 			goto done;
 		if (msp->restart) {

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