Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 607cfab6 authored Sep 14, 2009 by Andreas Mohr Committed by Mauro Carvalho Chehab Sep 19, 2009

V4L/DVB (13003): Correct dangerous and inefficient msecs_to_jiffies()...

V4L/DVB (13003): Correct dangerous and inefficient msecs_to_jiffies() calculation in some V4L2 drivers

Signed-off-by: Andreas Mohr <andi@lisas.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

parent 6c119ff4

drivers/media/video/et61x251/et61x251_core.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -1379,8 +1379,10 @@ et61x251_read(struct file* filp, char __user * buf,
		(!list_empty(&cam->outqueue)) \|\|
		(cam->state & DEV_DISCONNECTED) \|\|
		(cam->state & DEV_MISCONFIGURED),
		cam->module_param.frame_timeout *
		1000 * msecs_to_jiffies(1) );
		msecs_to_jiffies(
		cam->module_param.frame_timeout * 1000
		)
		);
		if (timeout < 0) {
		mutex_unlock(&cam->fileop_mutex);
		return timeout;

drivers/media/video/sn9c102/sn9c102_core.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -1954,8 +1954,10 @@ sn9c102_read(struct file* filp, char __user * buf, size_t count, loff_t* f_pos)
		(!list_empty(&cam->outqueue)) \|\|
		(cam->state & DEV_DISCONNECTED) \|\|
		(cam->state & DEV_MISCONFIGURED),
		cam->module_param.frame_timeout *
		1000 * msecs_to_jiffies(1) );
		msecs_to_jiffies(
		cam->module_param.frame_timeout * 1000
		)
		);
		if (timeout < 0) {
		mutex_unlock(&cam->fileop_mutex);
		return timeout;

drivers/media/video/zc0301/zc0301_core.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -819,8 +819,10 @@ zc0301_read(struct file* filp, char __user * buf, size_t count, loff_t* f_pos)
		(!list_empty(&cam->outqueue)) \|\|
		(cam->state & DEV_DISCONNECTED) \|\|
		(cam->state & DEV_MISCONFIGURED),
		cam->module_param.frame_timeout *
		1000 * msecs_to_jiffies(1) );
		msecs_to_jiffies(
		cam->module_param.frame_timeout * 1000
		)
		);
		if (timeout < 0) {
		mutex_unlock(&cam->fileop_mutex);
		return timeout;