diff --git a/[refs] b/[refs]
index c752d0402f3b..ccc2001b8b1e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d715e766ddf4786a06abe6a841e956ad8a875963
+refs/heads/master: 84149a0f70a73385ee7fbb77024544cbed4fe16d
diff --git a/trunk/drivers/media/video/ivtv/ivtv-fb.c b/trunk/drivers/media/video/ivtv/ivtv-fb.c
index 55265bd5c250..6f5da57299a1 100644
--- a/trunk/drivers/media/video/ivtv/ivtv-fb.c
+++ b/trunk/drivers/media/video/ivtv/ivtv-fb.c
@@ -420,7 +420,7 @@ static int ivtvfb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long ar
 
 		case FBIO_WAITFORVSYNC:
 			prepare_to_wait(&itv->vsync_waitq, &wait, TASK_INTERRUPTIBLE);
-			if (!schedule_timeout(HZ/20)) rc = -ETIMEDOUT;
+			if (!schedule_timeout(msecs_to_jiffies(50))) rc = -ETIMEDOUT;
 			finish_wait(&itv->vsync_waitq, &wait);
 			return rc;