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

[PATCH] media/planb: replace interruptible_sleep_on() with wait_event()

Use wait_event() instead of the deprecated interruptible_sleep_on().  Current
code does not check for signals, so interruptible seems unnecessary.
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 7ea2cda8
......@@ -40,6 +40,7 @@
#include <linux/mm.h>
#include <linux/sched.h>
#include <linux/videodev.h>
#include <linux/wait.h>
#include <asm/uaccess.h>
#include <asm/io.h>
#include <asm/prom.h>
......@@ -1609,8 +1610,7 @@ static int planb_ioctl(struct video_device *dev, unsigned int cmd, void *arg)
}
planb_lock(pb);
/* empty the grabbing queue */
while(pb->grabbing)
interruptible_sleep_on(&pb->capq);
wait_event(pb->capq, !pb->grabbing);
pb->maxlines = maxlines;
pb->win.norm = v.norm;
/* Stop overlay if running */
......
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