From: Gerd Knorr <kraxel@bytesex.org> Use wait_event() instead of the deprecated interruptible_sleep_on(). Current code does not check for signals, so interruptible seems unnecessary. Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com> Signed-off-by: Domen Puncer <domen@coderock.org> Signed-off-by: Gerd Knorr <kraxel@bytesex.org> Signed-off-by: Andrew Morton <akpm@osdl.org> --- 25-akpm/drivers/media/video/planb.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff -puN drivers/media/video/planb.c~media-planb-replace-interruptible_sleep_on-with-wait_event drivers/media/video/planb.c --- 25/drivers/media/video/planb.c~media-planb-replace-interruptible_sleep_on-with-wait_event 2005-03-11 12:32:21.000000000 -0800 +++ 25-akpm/drivers/media/video/planb.c 2005-03-11 12:32:21.000000000 -0800 @@ -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_devi } 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 */ _