diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-17 21:29:07 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-20 22:35:50 +0200 |
| commit | 818ca4711eb8ec064c1cd5d7657f95ed6bc2bbed (patch) | |
| tree | 15c4f9fe180ca13b56340a8c1fb4c7858a125314 /drivers | |
| parent | V4L/DVB (5859): use msecs_to_jiffies on InfraRed RC5 timeout (diff) | |
| download | linux-818ca4711eb8ec064c1cd5d7657f95ed6bc2bbed.tar.xz linux-818ca4711eb8ec064c1cd5d7657f95ed6bc2bbed.zip | |
V4L/DVB (5860): Use msecs_to_jiffies instead of HZ on some webcam drivers
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/video/c-qcam.c | 4 | ||||
| -rw-r--r-- | drivers/media/video/vino.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/c-qcam.c b/drivers/media/video/c-qcam.c index 925ff17efbbc..f76c6a6c3766 100644 --- a/drivers/media/video/c-qcam.c +++ b/drivers/media/video/c-qcam.c @@ -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; diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c index e94a9a6036f5..a0c1647a2ba4 100644 --- a/drivers/media/video/vino.c +++ b/drivers/media/video/vino.c @@ -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; |