aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/ivtv/ivtv-driver.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/ivtv/ivtv-driver.c')
-rw-r--r--drivers/media/video/ivtv/ivtv-driver.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/ivtv/ivtv-driver.c b/drivers/media/video/ivtv/ivtv-driver.c
index 9e4edb8b7d82..d73d433a4ff6 100644
--- a/drivers/media/video/ivtv/ivtv-driver.c
+++ b/drivers/media/video/ivtv/ivtv-driver.c
@@ -275,9 +275,10 @@ int ivtv_waitq(wait_queue_head_t *waitq)
275} 275}
276 276
277/* Generic utility functions */ 277/* Generic utility functions */
278int ivtv_sleep_timeout(int timeout, int intr) 278int ivtv_msleep_timeout(unsigned int msecs, int intr)
279{ 279{
280 int ret; 280 int ret;
281 int timeout = msecs_to_jiffies(msecs);
281 282
282 do { 283 do {
283 set_current_state(intr ? TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE); 284 set_current_state(intr ? TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE);