From f3a43d3082cd9c2308612e0331ad3b1b9d3a7a33 Mon Sep 17 00:00:00 2001 From: "Robert P. J. Day" Date: Mon, 16 Jul 2007 10:46:42 -0300 Subject: V4L/DVB (5846): Clean up setting state and scheduling timeouts Replace assignments to "current->state" with the preferred calls to schedule_timeout_interruptible(). Signed-off-by: Robert P. J. Day Signed-off-by: Mauro Carvalho Chehab --- drivers/media/video/vino.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'drivers/media/video/vino.c') diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c index 0c658b74f2c..e94a9a6036f 100644 --- a/drivers/media/video/vino.c +++ b/drivers/media/video/vino.c @@ -2077,12 +2077,10 @@ static int vino_wait_for_frame(struct vino_channel_settings *vcs) init_waitqueue_entry(&wait, current); /* add ourselves into wait queue */ add_wait_queue(&vcs->fb_queue.frame_wait_queue, &wait); - /* and set current state */ - set_current_state(TASK_INTERRUPTIBLE); /* to ensure that schedule_timeout will return immediately - * if VINO interrupt was triggred meanwhile */ - schedule_timeout(HZ / 10); + * if VINO interrupt was triggered meanwhile */ + schedule_timeout_interruptible(HZ / 10); if (signal_pending(current)) err = -EINTR; -- cgit v1.2.3