sound/rawmidi: replace
Subsystems (2)
PATCH 32/33 sound/rawmidi: replace
Hi,
Please consider applying.
Description: Use wai_event_interruptible_timeout() instead of deprecated interruptible_sleep_on_timeout(). Patch is compile-tested.
Signed-off-by Nishanth Aravamudan <[email protected]>
sound/core/rawmidi.c +9 -11
@@ -30,6 +30,7 @@#include <linux/wait.h> #include <linux/moduleparam.h> #include <linux/delay.h> +#include <linux/wait.h> #include <sound/rawmidi.h> #include <sound/info.h> #include <sound/control.h>
@@ -133,17 +134,14 @@ int snd_rawmidi_drain_output(snd_rawmidi err =0 ; runtime->drain =1 ; -while (runtime->avail < runtime->buffer_size) { - timeout =interruptible_sleep_on_timeout (&runtime->sleep,10 *HZ ); -if (signal_pending (current)) { - err = -ERESTARTSYS ; -break ; - } -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); - err = -EIO ; -break ; - } + timeout =wait_event_interruptible_timeout (runtime->sleep, + (runtime->avail >= runtime->buffer_size), +10 *HZ ); +if (signal_pending (current)) + err = -ERESTARTSYS ; +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); + err = -EIO ; } runtime->drain =0 ;if (err != -ERESTARTSYS ) {
_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors