提交 818ca471 编写于 作者: M Mauro Carvalho Chehab

V4L/DVB (5860): Use msecs_to_jiffies instead of HZ on some webcam drivers

Signed-off-by: NMauro Carvalho Chehab <mchehab@infradead.org>
上级 f7518bd2
......@@ -95,7 +95,7 @@ static unsigned int qcam_await_ready1(struct qcam_device *qcam,
unsigned long oldjiffies = jiffies;
unsigned int i;
for (oldjiffies = jiffies; (jiffies - oldjiffies) < (HZ/25); )
for (oldjiffies = jiffies; (jiffies - oldjiffies) < msecs_to_jiffies(40); )
if (qcam_ready1(qcam) == value)
return 0;
......@@ -120,7 +120,7 @@ static unsigned int qcam_await_ready2(struct qcam_device *qcam, int value)
unsigned long oldjiffies = jiffies;
unsigned int i;
for (oldjiffies = jiffies; (jiffies - oldjiffies) < (HZ/25); )
for (oldjiffies = jiffies; (jiffies - oldjiffies) < msecs_to_jiffies(40); )
if (qcam_ready2(qcam) == value)
return 0;
......
......@@ -2080,7 +2080,7 @@ static int vino_wait_for_frame(struct vino_channel_settings *vcs)
/* to ensure that schedule_timeout will return immediately
* if VINO interrupt was triggered meanwhile */
schedule_timeout_interruptible(HZ / 10);
schedule_timeout_interruptible(msecs_to_jiffies(100));
if (signal_pending(current))
err = -EINTR;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册