diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-17 16:29:07 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-17 16:29:07 -0300 |
| commit | f43cd4816ecdd3e526ab2dc70a9e956c6ef9541c (patch) | |
| tree | 64c160c2d2b1092a5afde0b543ee1cd343690b44 | |
| parent | 81be57ff7e56a6c5b7a0eafd6106f1a17c53e95e (diff) | |
| download | mediapointer-dvb-s2-f43cd4816ecdd3e526ab2dc70a9e956c6ef9541c.tar.gz mediapointer-dvb-s2-f43cd4816ecdd3e526ab2dc70a9e956c6ef9541c.tar.bz2 | |
Use msecs_to_jiffies instead of HZ on some webcam drivers
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | linux/drivers/media/video/c-qcam.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/vino.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/video/c-qcam.c b/linux/drivers/media/video/c-qcam.c index 2c8fa78ee..609cd084d 100644 --- a/linux/drivers/media/video/c-qcam.c +++ b/linux/drivers/media/video/c-qcam.c @@ -102,7 +102,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; @@ -127,7 +127,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/linux/drivers/media/video/vino.c b/linux/drivers/media/video/vino.c index c4893e9e3..4c2526439 100644 --- a/linux/drivers/media/video/vino.c +++ b/linux/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; |