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>

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;