summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/vino.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-07-16 10:46:42 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-07-16 10:46:42 -0300
commit232fd0b3fa9770197cfeb0a7dd40ac52729104f2 (patch)
treeb32cc58b284d4007f979c6286eefce6dfbfd27a3 /linux/drivers/media/video/vino.c
parentbcb7869683912e8dca99bace426b7e080851354c (diff)
downloadmediapointer-dvb-s2-232fd0b3fa9770197cfeb0a7dd40ac52729104f2.tar.gz
mediapointer-dvb-s2-232fd0b3fa9770197cfeb0a7dd40ac52729104f2.tar.bz2
Clean up setting state and scheduling timeouts
From: Robert P. J. Day <rpjday@mindspring.com> 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 'linux/drivers/media/video/vino.c')
-rw-r--r--linux/drivers/media/video/vino.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/linux/drivers/media/video/vino.c b/linux/drivers/media/video/vino.c
index 26f99cf1d..c4893e9e3 100644
--- a/linux/drivers/media/video/vino.c
+++ b/linux/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;