diff options
Diffstat (limited to 'drivers/media/video/vino.c')
| -rw-r--r-- | drivers/media/video/vino.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c index 0c658b7..9a03dc8 100644 --- a/drivers/media/video/vino.c +++ b/drivers/media/video/vino.c @@ -28,7 +28,6 @@ #include <linux/interrupt.h> #include <linux/kernel.h> #include <linux/mm.h> -#include <linux/moduleparam.h> #include <linux/time.h> #include <linux/version.h> @@ -2077,12 +2076,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(msecs_to_jiffies(100)); if (signal_pending(current)) err = -EINTR; |
