diff options
author | Andreas Mohr <andi@lisas.de> | 2009-09-14 18:13:29 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-18 23:52:18 -0400 |
commit | 607cfab6e7bce8049e61795e86f9bbbe07abd514 (patch) | |
tree | 5b5b6469a3c569f102cd7b6ec314fe2388072349 /drivers/media/video/et61x251 | |
parent | 6c119ff493039af862ae57d88d52b4383c9d8ece (diff) |
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.c | 6 |
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, | |||
1379 | (!list_empty(&cam->outqueue)) || | 1379 | (!list_empty(&cam->outqueue)) || |
1380 | (cam->state & DEV_DISCONNECTED) || | 1380 | (cam->state & DEV_DISCONNECTED) || |
1381 | (cam->state & DEV_MISCONFIGURED), | 1381 | (cam->state & DEV_MISCONFIGURED), |
1382 | cam->module_param.frame_timeout * | 1382 | msecs_to_jiffies( |
1383 | 1000 * msecs_to_jiffies(1) ); | 1383 | cam->module_param.frame_timeout * 1000 |
1384 | ) | ||
1385 | ); | ||
1384 | if (timeout < 0) { | 1386 | if (timeout < 0) { |
1385 | mutex_unlock(&cam->fileop_mutex); | 1387 | mutex_unlock(&cam->fileop_mutex); |
1386 | return timeout; | 1388 | return timeout; |