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

• Lines: 26
• Date: Thu Nov 5 09:58:46 1998
• Orig file: v2.1.126/linux/drivers/sound/sonicvibes.c
• Orig date: Sat Sep 5 16:46:41 1998

diff -u --recursive --new-file v2.1.126/linux/drivers/sound/sonicvibes.c linux/drivers/sound/sonicvibes.c
@@ -1245,11 +1245,8 @@
                 }
 		tmo = (count * HZ) / s->ratedac;
 		tmo >>= sample_shift[(s->fmt >> SV_CFMT_ASHIFT) & SV_CFMT_MASK];
-		current->timeout = jiffies + (tmo ? tmo : 1);
-                schedule();
-		if (tmo && !current->timeout)
+		if (!schedule_timeout(tmo ? : 1) && tmo)
 			printk(KERN_DEBUG "sv: dma timed out??\n");
-		current->timeout = 0;
         }
         remove_wait_queue(&s->dma_dac.wait, &wait);
         current->state = TASK_RUNNING;
@@ -2025,11 +2022,8 @@
 				return -EBUSY;
 			}
 			tmo = (count * HZ) / 3100;
-			current->timeout = tmo ? jiffies + tmo : 0;
-			schedule();
-			if (tmo && !current->timeout)
+			if (!schedule_timeout(tmo ? : 1) && tmo)
 				printk(KERN_DEBUG "sv: midi timed out??\n");
-			current->timeout = 0;
 		}
 		remove_wait_queue(&s->midi.owait, &wait);
 		current->state = TASK_RUNNING;