aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-07-17 15:29:07 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-07-20 16:35:50 -0400
commit818ca4711eb8ec064c1cd5d7657f95ed6bc2bbed (patch)
tree15c4f9fe180ca13b56340a8c1fb4c7858a125314 /drivers/media/video
parentf7518bd2d9ecad8c404c300e7872f7c2ab4961ad (diff)
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/media/video')
-rw-r--r--drivers/media/video/c-qcam.c4
-rw-r--r--drivers/media/video/vino.c2
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,
95 unsigned long oldjiffies = jiffies; 95 unsigned long oldjiffies = jiffies;
96 unsigned int i; 96 unsigned int i;
97 97
98 for (oldjiffies = jiffies; (jiffies - oldjiffies) < (HZ/25); ) 98 for (oldjiffies = jiffies; (jiffies - oldjiffies) < msecs_to_jiffies(40); )
99 if (qcam_ready1(qcam) == value) 99 if (qcam_ready1(qcam) == value)
100 return 0; 100 return 0;
101 101
@@ -120,7 +120,7 @@ static unsigned int qcam_await_ready2(struct qcam_device *qcam, int value)
120 unsigned long oldjiffies = jiffies; 120 unsigned long oldjiffies = jiffies;
121 unsigned int i; 121 unsigned int i;
122 122
123 for (oldjiffies = jiffies; (jiffies - oldjiffies) < (HZ/25); ) 123 for (oldjiffies = jiffies; (jiffies - oldjiffies) < msecs_to_jiffies(40); )
124 if (qcam_ready2(qcam) == value) 124 if (qcam_ready2(qcam) == value)
125 return 0; 125 return 0;
126 126
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)
2080 2080
2081 /* to ensure that schedule_timeout will return immediately 2081 /* to ensure that schedule_timeout will return immediately
2082 * if VINO interrupt was triggered meanwhile */ 2082 * if VINO interrupt was triggered meanwhile */
2083 schedule_timeout_interruptible(HZ / 10); 2083 schedule_timeout_interruptible(msecs_to_jiffies(100));
2084 2084
2085 if (signal_pending(current)) 2085 if (signal_pending(current))
2086 err = -EINTR; 2086 err = -EINTR;