1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/media/video/c-qcam.c b/drivers/media/video/c-qcam.c
index 2c85ced61150..fe1e67bb1ca8 100644
--- a/drivers/media/video/c-qcam.c
+++ b/drivers/media/video/c-qcam.c
@@ -36,6 +36,7 @@
 #include <linux/videodev.h>
 #include <media/v4l2-common.h>
 #include <linux/mutex.h>
+#include <linux/jiffies.h>
 
 #include <asm/uaccess.h>
 
@@ -95,7 +96,8 @@ static unsigned int qcam_await_ready1(struct qcam_device *qcam,
         unsigned long oldjiffies = jiffies;
         unsigned int i;
 
-        for (oldjiffies = jiffies; (jiffies - oldjiffies) < msecs_to_jiffies(40); )
+        for (oldjiffies = jiffies;
+             time_before(jiffies, oldjiffies + msecs_to_jiffies(40)); )
                 if (qcam_ready1(qcam) == value)
                         return 0;
 
@@ -120,7 +122,8 @@ static unsigned int qcam_await_ready2(struct qcam_device *qcam, int value)
         unsigned long oldjiffies = jiffies;
         unsigned int i;
 
-        for (oldjiffies = jiffies; (jiffies - oldjiffies) < msecs_to_jiffies(40); )
+        for (oldjiffies = jiffies;
+             time_before(jiffies, oldjiffies + msecs_to_jiffies(40)); )
                 if (qcam_ready2(qcam) == value)
                         return 0;