Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=818ca4711eb8ec064c1cd5d7657f95ed6bc2bbed
Commit:     818ca4711eb8ec064c1cd5d7657f95ed6bc2bbed
Parent:     f7518bd2d9ecad8c404c300e7872f7c2ab4961ad
Author:     Mauro Carvalho Chehab <[EMAIL PROTECTED]>
AuthorDate: Tue Jul 17 16:29:07 2007 -0300
Committer:  Mauro Carvalho Chehab <[EMAIL PROTECTED]>
CommitDate: Fri Jul 20 17:35:50 2007 -0300

    V4L/DVB (5860): Use msecs_to_jiffies instead of HZ on some webcam drivers
    
    Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
 drivers/media/video/c-qcam.c |    4 ++--
 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 925ff17..f76c6a6 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 e94a9a6..a0c1647 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;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to