summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/et61x251
diff options
context:
space:
mode:
authorAndreas Mohr <andi@lisas.de>2009-09-14 19:13:29 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-09-19 00:52:18 -0300
commit607cfab6e7bce8049e61795e86f9bbbe07abd514 (patch)
tree5b5b6469a3c569f102cd7b6ec314fe2388072349 /drivers/media/video/et61x251
parent6c119ff493039af862ae57d88d52b4383c9d8ece (diff)
downloadblackbird-obmc-linux-607cfab6e7bce8049e61795e86f9bbbe07abd514.tar.gz
blackbird-obmc-linux-607cfab6e7bce8049e61795e86f9bbbe07abd514.zip
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>
Diffstat (limited to 'drivers/media/video/et61x251')
-rw-r--r--drivers/media/video/et61x251/et61x251_core.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/video/et61x251/et61x251_core.c b/drivers/media/video/et61x251/et61x251_core.c
index d1c1e457f0b9..74092f436be6 100644
--- a/drivers/media/video/et61x251/et61x251_core.c
+++ b/drivers/media/video/et61x251/et61x251_core.c
@@ -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;
OpenPOWER on IntegriCloud