Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa

1 files changed, 1 insertions, 2 deletions

diff --git a/sound/isa/sb/emu8000_patch.c b/sound/isa/sb/emu8000_patch.c
index 26e693078cb3..2fea67e71c78 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;
         }