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

• Lines: 62
• Date: Sat Nov 7 10:56:05 1998
• Orig file: v2.1.126/linux/drivers/char/lp.c
• Orig date: Fri Oct 23 22:01:20 1998

diff -u --recursive --new-file v2.1.126/linux/drivers/char/lp.c linux/drivers/char/lp.c
@@ -162,17 +162,17 @@
 		lp_table[minor].irq_missed = 1;
 }
 
-static __inline__ void lp_schedule(int minor)
+static __inline__ void lp_schedule(int minor, long timeout)
 {
 	struct pardevice *dev = lp_table[minor].dev;
 	register unsigned long int timeslip = (jiffies - dev->time);
 	if ((timeslip > dev->timeslice) && (dev->port->waithead != NULL)) {
 		lp_parport_release(minor);
 		lp_table[minor].irq_missed = 1;
-		schedule ();
+		schedule_timeout(timeout);
 		lp_parport_claim(minor);
 	} else
-		schedule();
+		schedule_timeout(timeout);
 }
 
 static int lp_reset(int minor)
@@ -269,9 +269,8 @@
 {
 	if (LP_POLLED(minor) || LP_PREEMPTED(minor)) {
 		current->state = TASK_INTERRUPTIBLE;
-		current->timeout = jiffies + LP_TIMEOUT_POLLED;
 		lp_parport_release(minor);
-		schedule();
+		schedule_timeout(LP_TIMEOUT_POLLED);
 		lp_parport_claim(minor);
 		lp_table[minor].irq_missed = 1;
 	}
@@ -381,8 +380,7 @@
 					printk(KERN_DEBUG "lp%d sleeping at %d characters for %d jiffies\n", minor, lp->runchars, LP_TIME(minor));
 #endif
 					current->state = TASK_INTERRUPTIBLE;
-					current->timeout = jiffies + LP_TIME(minor);
-					lp_schedule (minor);
+					lp_schedule(minor, LP_TIME(minor));
 				} else {
 					cli();
 					if (LP_PREEMPTED(minor))
@@ -399,8 +397,7 @@
 					}
 					if (!lp_table[minor].irq_detected)
 					{
-						current->timeout = jiffies + LP_TIMEOUT_INTERRUPT;
-						interruptible_sleep_on(&lp->wait_q);
+						interruptible_sleep_on_timeout(&lp->wait_q, LP_TIMEOUT_INTERRUPT);
 					}
 					sti();
 				}
@@ -535,8 +532,7 @@
 					return -EINTR;
 			}
 			current->state=TASK_INTERRUPTIBLE;
-			current->timeout=jiffies + LP_TIME(minor);
-			schedule ();
+			schedule_timeout(LP_TIME(minor));
 		}
 
 		counter=0;