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

Next file: linux/drivers/sound/maui.c
Previous file: linux/drivers/sound/es1371.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.126/linux/drivers/sound/gus_wave.c linux/drivers/sound/gus_wave.c
@@ -1927,11 +1927,8 @@
 			 */
 			active_device = GUS_DEV_WAVE;
 
-			current->timeout = jiffies + HZ;
-			interruptible_sleep_on(&dram_sleeper);
-			if (!current->timeout)
+			if (!interruptible_sleep_on_timeout(&dram_sleeper, HZ))
 				printk("GUS: DMA Transfer timed out\n");
-			current->timeout = 0;
 			restore_flags(flags);
 		}
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov