Commit 818ca471 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

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



Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent f7518bd2

drivers/media/video/c-qcam.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/media/video/vino.c

+1 −1
Original line number Diff line number Diff line
@@ -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;