patch-2.1.127 linux/drivers/isdn/sc/init.c

• Lines: 40
• Date: Thu Nov 5 09:58:44 1998
• Orig file: v2.1.126/linux/drivers/isdn/sc/init.c
• Orig date: Wed Apr 1 20:11:52 1998

diff -u --recursive --new-file v2.1.126/linux/drivers/isdn/sc/init.c linux/drivers/isdn/sc/init.c
@@ -165,8 +165,7 @@
 			pr_debug("Doing a SAFE probe reset\n");
 			outb(0xFF, io[b] + RESET_OFFSET);
 			current->state = TASK_INTERRUPTIBLE;
-			current->timeout = jiffies + milliseconds(10000);
-			schedule();
+			schedule_timeout(milliseconds(10000));
 		}
 		pr_debug("RAM Base for board %d is 0x%x, %s probe\n", b, ram[b],
 			ram[b] == 0 ? "will" : "won't");
@@ -514,8 +513,7 @@
 	 */
 	outb(PRI_BASEPG_VAL, pgport);
 	current->state = TASK_INTERRUPTIBLE;
-	current->timeout = jiffies + HZ;
-	schedule();
+	schedule_timeout(HZ);
 	sig = readl(rambase + SIG_OFFSET);
 	pr_debug("Looking for a signature, got 0x%x\n", sig);
 #if 0
@@ -535,8 +533,7 @@
 	 */
 	outb(BRI_BASEPG_VAL, pgport);
 	current->state = TASK_INTERRUPTIBLE;
-	current->timeout = jiffies + HZ;
-	schedule();
+	schedule_timeout(HZ);
 	sig = readl(rambase + SIG_OFFSET);
 	pr_debug("Looking for a signature, got 0x%x\n", sig);
 #if 0
@@ -571,8 +568,7 @@
 	x = 0;
 	while((inb(iobase + FIFOSTAT_OFFSET) & RF_HAS_DATA) && x < 100) {
 		current->state = TASK_INTERRUPTIBLE;
-		current->timeout = jiffies + 1;
-		schedule();
+		schedule_timeout(1);
 		x++;
 	}
 	if(x == 100) {