Commit 86154747 authored by Gerd Knorr's avatar Gerd Knorr Committed by Linus Torvalds

[PATCH] media/zoran_device: replace interruptible_sleep_on() with wait_event_interruptible()

Use wait_event_interruptible() instead of the deprecated
interruptible_sleep_on().  Patch is compile-tested.
Signed-off-by: default avatarNishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: default avatarDomen Puncer <domen@coderock.org>
Signed-off-by: default avatarGerd Knorr <kraxel@bytesex.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 50b5642a
......@@ -46,6 +46,7 @@
#include <linux/video_decoder.h>
#include <linux/video_encoder.h>
#include <linux/delay.h>
#include <linux/wait.h>
#include <asm/io.h>
......@@ -696,11 +697,10 @@ wait_grab_pending (struct zoran *zr)
if (!zr->v4l_memgrab_active)
return 0;
while (zr->v4l_pend_tail != zr->v4l_pend_head) {
interruptible_sleep_on(&zr->v4l_capq);
if (signal_pending(current))
return -ERESTARTSYS;
}
wait_event_interruptible(zr->v4l_capq,
(zr->v4l_pend_tail == zr->v4l_pend_head));
if (signal_pending(current))
return -ERESTARTSYS;
spin_lock_irqsave(&zr->spinlock, flags);
zr36057_set_memgrab(zr, 0);
......
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