diff --exclude='*~' -urN 2.6.9-rc4-mm1-RT-U6a/sound/core/rawmidi.c 2.6.9-rc4-mm1-VP-U4-LRT1/sound/core/rawmidi.c --- 2.6.9-rc4-mm1-RT-U6a/sound/core/rawmidi.c 2004-10-12 09:32:23.000000000 +0200 +++ 2.6.9-rc4-mm1-VP-U4-LRT1/sound/core/rawmidi.c 2004-10-19 20:44:18.000000000 +0200 @@ -134,7 +134,8 @@ err = 0; runtime->drain = 1; while (runtime->avail < runtime->buffer_size) { - timeout = interruptible_sleep_on_timeout(&runtime->sleep, 10 * HZ); + timeout = wait_event_interruptible_timeout(runtime->sleep, + runtime->avail < runtime->buffer_size, 10 * HZ); if (signal_pending(current)) { err = -ERESTARTSYS; break;