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

Next file: linux/drivers/char/console.c
Previous file: linux/drivers/char/bw-qcam.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.126/linux/drivers/char/c-qcam.c linux/drivers/char/c-qcam.c
@@ -58,8 +58,7 @@
 		if (qcam_ready1(qcam) == value)
 			return 0;
 		current->state=TASK_INTERRUPTIBLE;
-		current->timeout = jiffies+HZ/10;
-		schedule();
+		schedule_timeout(HZ/10);
 	}
 
 	/* Probably somebody pulled the plug out.  Not much we can do. */
@@ -85,8 +84,7 @@
 		if (qcam_ready2(qcam) == value)
 			return 0;
 		current->state=TASK_INTERRUPTIBLE;
-		current->timeout = jiffies+HZ/10;
-		schedule();
+		schedule_timeout(HZ/10);
 	}
 
 	/* Probably somebody pulled the plug out.  Not much we can do. */

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