patch-2.1.127 linux/drivers/isdn/hisax/elsa.c

• Lines: 25
• Date: Thu Nov 5 09:58:44 1998
• Orig file: v2.1.126/linux/drivers/isdn/hisax/elsa.c
• Orig date: Wed Apr 1 20:11:50 1998

diff -u --recursive --new-file v2.1.126/linux/drivers/isdn/hisax/elsa.c linux/drivers/isdn/hisax/elsa.c
@@ -450,12 +450,10 @@
 		sti();
 		writereg(cs->hw.elsa.ale, cs->hw.elsa.isac, IPAC_POTA2, 0x20);
 		current->state = TASK_INTERRUPTIBLE;
-		current->timeout = jiffies + (10 * HZ) / 1000;	/* Timeout 10ms */
-		schedule();
+		schedule_timeout((10*HZ)/1000);	/* Timeout 10ms */
 		writereg(cs->hw.elsa.ale, cs->hw.elsa.isac, IPAC_POTA2, 0x00);
 		current->state = TASK_INTERRUPTIBLE;
-		current->timeout = jiffies + (10 * HZ) / 1000;	/* Timeout 10ms */
-		schedule();
+		schedule_timeout((10*HZ)/1000);	/* Timeout 10ms */
 		writereg(cs->hw.elsa.ale, cs->hw.elsa.isac, IPAC_MASK, 0xc0);
 		schedule();
 		restore_flags(flags);
@@ -658,8 +656,7 @@
 			} else
 				return(0);
 			current->state = TASK_INTERRUPTIBLE;
-			current->timeout = jiffies + (110 * HZ) / 1000;		/* Timeout 110ms */
-			schedule();
+			schedule_timeout((110*HZ)/1000);		/* Timeout 110ms */
 			restore_flags(flags);
 			cs->hw.elsa.ctrl_reg &= ~ELSA_ENA_TIMER_INT;
 			byteout(cs->hw.elsa.ctrl, cs->hw.elsa.ctrl_reg);