patch-2.1.127 linux/drivers/sound/wavfront.c

• Lines: 23
• Date: Wed Nov 4 09:50:01 1998
• Orig file: v2.1.126/linux/drivers/sound/wavfront.c
• Orig date: Thu Sep 17 17:53:37 1998

diff -u --recursive --new-file v2.1.126/linux/drivers/sound/wavfront.c linux/drivers/sound/wavfront.c
@@ -343,11 +343,8 @@
 wavefront_sleep (wf_config *hw, int limit)
 
 {
-	current->timeout = jiffies + limit;
 	current->state = TASK_INTERRUPTIBLE;
-	schedule();
-	current->timeout = 0;
-
+	schedule_timeout(limit);
 	return signal_pending(current);
 }
     
@@ -2266,8 +2263,7 @@
 	cli();
 	hw->irq_ok = 0;
 	outb (val,port);
-	current->timeout = jiffies + timeout;
-	interruptible_sleep_on (&hw->interrupt_sleeper);
+	interruptible_sleep_on_timeout(&hw->interrupt_sleeper, timeout);
 	restore_flags (flags);
 }