summaryrefslogtreecommitdiffstats
path: root/sound/isa/sb/emu8000_patch.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-07 08:09:02 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-07 08:09:02 -0800
commit8f0cb147b2fb12427bf6abef7fed2b604557a41e (patch)
treefb5ba437ee74b900fab9686c8c7df18abcd7640b /sound/isa/sb/emu8000_patch.c
parent8e33ba49765484bc6de3a2f8143733713fa93bc1 (diff)
parentb00e8443c3eece823052d06ae1c7cb797ab0ddf5 (diff)
downloadop-kernel-dev-8f0cb147b2fb12427bf6abef7fed2b604557a41e.zip
op-kernel-dev-8f0cb147b2fb12427bf6abef7fed2b604557a41e.tar.gz
Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
Diffstat (limited to 'sound/isa/sb/emu8000_patch.c')
-rw-r--r--sound/isa/sb/emu8000_patch.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/isa/sb/emu8000_patch.c b/sound/isa/sb/emu8000_patch.c
index 26e6930..2fea67e 100644
--- a/sound/isa/sb/emu8000_patch.c
+++ b/sound/isa/sb/emu8000_patch.c
@@ -109,8 +109,7 @@ static void
snd_emu8000_write_wait(emu8000_t *emu)
{
while ((EMU8000_SMALW_READ(emu) & 0x80000000) != 0) {
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(1);
+ schedule_timeout_interruptible(1);
if (signal_pending(current))
break;
}
OpenPOWER on IntegriCloud