Commit 553623ec authored by Jaroslav Kysela's avatar Jaroslav Kysela

[ALSA] replace interruptible_sleep_on_timeout() with wait_event_interruptible_timeout()

RawMidi Midlevel
Use wai_event_interruptible_timeout() instead of deprecated
interruptible_sleep_on_timeout(). Patch is compile-tested.
Signed-off-by: default avatarNishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent bce794ba
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <linux/wait.h> #include <linux/wait.h>
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/wait.h>
#include <sound/rawmidi.h> #include <sound/rawmidi.h>
#include <sound/info.h> #include <sound/info.h>
#include <sound/control.h> #include <sound/control.h>
...@@ -133,17 +134,14 @@ int snd_rawmidi_drain_output(snd_rawmidi_substream_t * substream) ...@@ -133,17 +134,14 @@ int snd_rawmidi_drain_output(snd_rawmidi_substream_t * substream)
err = 0; err = 0;
runtime->drain = 1; runtime->drain = 1;
while (runtime->avail < runtime->buffer_size) { timeout = wait_event_interruptible_timeout(runtime->sleep,
timeout = interruptible_sleep_on_timeout(&runtime->sleep, 10 * HZ); (runtime->avail >= runtime->buffer_size),
if (signal_pending(current)) { 10*HZ);
if (signal_pending(current))
err = -ERESTARTSYS; err = -ERESTARTSYS;
break;
}
if (runtime->avail < runtime->buffer_size && !timeout) { if (runtime->avail < runtime->buffer_size && !timeout) {
snd_printk(KERN_WARNING "rawmidi drain error (avail = %li, buffer_size = %li)\n", (long)runtime->avail, (long)runtime->buffer_size); snd_printk(KERN_WARNING "rawmidi drain error (avail = %li, buffer_size = %li)\n", (long)runtime->avail, (long)runtime->buffer_size);
err = -EIO; err = -EIO;
break;
}
} }
runtime->drain = 0; runtime->drain = 0;
if (err != -ERESTARTSYS) { if (err != -ERESTARTSYS) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment