summaryrefslogtreecommitdiff
path: root/drivers/media/video/vino.c
diff options
context:
space:
mode:
authorRobert P. J. Day <rpjday@mindspring.com>2007-07-16 17:46:42 +0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-07-18 21:24:49 +0400
commitf3a43d3082cd9c2308612e0331ad3b1b9d3a7a33 (patch)
treefe0a76b3a104dac10c51d2a8da7772c534fbd251 /drivers/media/video/vino.c
parentbd58df6d522d5a9c791f6a4820e480e9be60650d (diff)
downloadlinux-f3a43d3082cd9c2308612e0331ad3b1b9d3a7a33.tar.xz
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 <rpjday@mindspring.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/vino.c')
-rw-r--r--drivers/media/video/vino.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c
index 0c658b74f2c4..e94a9a6036f5 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;