Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Mauro Carvalho Chehab 2007-07-17 16:29:07 -03:00
parent f7518bd2d9
commit 818ca4711e
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/media/video/c-qcam.c
View file

@ -95,7 +95,7 @@ static unsigned int qcam_await_ready1(struct qcam_device *qcam,
unsigned long oldjiffies = jiffies; unsigned long oldjiffies = jiffies;
unsigned int i; unsigned int i;
for (oldjiffies = jiffies; (jiffies - oldjiffies) < (HZ/25); ) for (oldjiffies = jiffies; (jiffies - oldjiffies) < msecs_to_jiffies(40); )
if (qcam_ready1(qcam) == value) if (qcam_ready1(qcam) == value)
return 0; return 0;
@ -120,7 +120,7 @@ static unsigned int qcam_await_ready2(struct qcam_device *qcam, int value)
unsigned long oldjiffies = jiffies; unsigned long oldjiffies = jiffies;
unsigned int i; unsigned int i;
for (oldjiffies = jiffies; (jiffies - oldjiffies) < (HZ/25); ) for (oldjiffies = jiffies; (jiffies - oldjiffies) < msecs_to_jiffies(40); )
if (qcam_ready2(qcam) == value) if (qcam_ready2(qcam) == value)
return 0; return 0;

2
drivers/media/video/vino.c
View file

@ -2080,7 +2080,7 @@ static int vino_wait_for_frame(struct vino_channel_settings *vcs)
/* to ensure that schedule_timeout will return immediately /* to ensure that schedule_timeout will return immediately
* if VINO interrupt was triggered meanwhile */ * if VINO interrupt was triggered meanwhile */
schedule_timeout_interruptible(HZ / 10); schedule_timeout_interruptible(msecs_to_jiffies(100));
if (signal_pending(current)) if (signal_pending(current))
err = -EINTR; err = -EINTR;