aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/vino.c
diff options
context:
space:
mode:
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)
2077 init_waitqueue_entry(&wait, current); 2077 init_waitqueue_entry(&wait, current);
2078 /* add ourselves into wait queue */ 2078 /* add ourselves into wait queue */
2079 add_wait_queue(&vcs->fb_queue.frame_wait_queue, &wait); 2079 add_wait_queue(&vcs->fb_queue.frame_wait_queue, &wait);
2080 /* and set current state */
2081 set_current_state(TASK_INTERRUPTIBLE);
2082 2080
2083 /* to ensure that schedule_timeout will return immediately 2081 /* to ensure that schedule_timeout will return immediately
2084 * if VINO interrupt was triggred meanwhile */ 2082 * if VINO interrupt was triggered meanwhile */
2085 schedule_timeout(HZ / 10); 2083 schedule_timeout_interruptible(HZ / 10);
2086 2084
2087 if (signal_pending(current)) 2085 if (signal_pending(current))
2088 err = -EINTR; 2086 err = -EINTR;