diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 17:09:02 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 17:09:02 +0100 |
| commit | 8f0cb147b2fb12427bf6abef7fed2b604557a41e (patch) | |
| tree | fb5ba437ee74b900fab9686c8c7df18abcd7640b /sound/isa/wavefront/wavefront_synth.c | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6 (diff) | |
| parent | [ALSA] version 1.0.10rc3 (diff) | |
| download | linux-8f0cb147b2fb12427bf6abef7fed2b604557a41e.tar.xz linux-8f0cb147b2fb12427bf6abef7fed2b604557a41e.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
Diffstat (limited to 'sound/isa/wavefront/wavefront_synth.c')
| -rw-r--r-- | sound/isa/wavefront/wavefront_synth.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/isa/wavefront/wavefront_synth.c b/sound/isa/wavefront/wavefront_synth.c index 0c3c951009d8..abd79b781412 100644 --- a/sound/isa/wavefront/wavefront_synth.c +++ b/sound/isa/wavefront/wavefront_synth.c @@ -275,8 +275,7 @@ static int wavefront_sleep (int limit) { - set_current_state(TASK_INTERRUPTIBLE); - schedule_timeout(limit); + schedule_timeout_interruptible(limit); return signal_pending(current); } @@ -1788,8 +1787,7 @@ wavefront_should_cause_interrupt (snd_wavefront_t *dev, outb (val,port); spin_unlock_irq(&dev->irq_lock); while (1) { - set_current_state(TASK_INTERRUPTIBLE); - if ((timeout = schedule_timeout(timeout)) == 0) + if ((timeout = schedule_timeout_interruptible(timeout)) == 0) return; if (dev->irq_ok) return; |