vserver 2.0 rc7

[linux-2.6.git] / sound / isa / gus / gus_pcm.c

diff --git a/sound/isa/gus/gus_pcm.c b/sound/isa/gus/gus_pcm.c
index aca7f3a..8995ad9 100644 (file)
--- a/sound/isa/gus/gus_pcm.c
+++ b/sound/isa/gus/gus_pcm.c
@@ -333,6 +333,7 @@ static int snd_gf1_pcm_poke_block(snd_gus_card_t *gus, unsigned char *buf,
                        }
                }
                if (count > 0 && !in_interrupt()) {
+                       set_current_state(TASK_INTERRUPTIBLE);
                        schedule_timeout(1);
                        if (signal_pending(current))
                                return -EAGAIN;
@@ -696,16 +697,10 @@ static int snd_gf1_pcm_playback_close(snd_pcm_substream_t * substream)
        snd_gus_card_t *gus = snd_pcm_substream_chip(substream);
        snd_pcm_runtime_t *runtime = substream->runtime;
        gus_pcm_private_t *pcmp = runtime->private_data;
-       unsigned long jiffies_old;
-
-       jiffies_old = jiffies;
-       while (atomic_read(&pcmp->dma_count) > 0) {
-               interruptible_sleep_on_timeout(&pcmp->sleep, 1);
-               if ((signed long)(jiffies - jiffies_old) > 2*HZ) {
-                       snd_printk("gf1 pcm - serious DMA problem\n");
-                       break;
-               }
-       }
+       
+       if (!wait_event_timeout(pcmp->sleep, (atomic_read(&pcmp->dma_count) <= 0), 2*HZ))
+               snd_printk("gf1 pcm - serious DMA problem\n");
+
        snd_gf1_dma_done(gus);  
        return 0;
 }