aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/IR
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2010-10-12 10:42:08 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-21 01:18:38 -0200
commitb784cfcec7293f688b09d3850826216a4e134d2e (patch)
treea71f990d9a36073a2175adb39aa1235f1f10665c /drivers/media/IR
parentb768d47eb6e467b198351c0344e2e3e49c45c476 (diff)
downloadmrst-s0i3-test-b784cfcec7293f688b09d3850826216a4e134d2e.tar.gz
mrst-s0i3-test-b784cfcec7293f688b09d3850826216a4e134d2e.tar.xz
mrst-s0i3-test-b784cfcec7293f688b09d3850826216a4e134d2e.zip
[media] IR/streamzap: fix usec to nsec conversion
There is an integer overflow here because 0x03000000 * 1000 is too large for 31 bits. rawir.duration should be in terms of nsecs. IR_MAX_DURATION and 0x03000000 are already in terms of nsecs. STREAMZAP_TIMEOUT and STREAMZAP_RESOLUTION are 255 and 256 respectively and are in terms of usecs. The original code had a deadline of 1.005 seconds and the new code has a deadline of .065 seconds. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Jarod Wilson <jarod@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/IR')
-rw-r--r--drivers/media/IR/streamzap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/IR/streamzap.c b/drivers/media/IR/streamzap.c
index 623ee2dc198..86a4f68feea 100644
--- a/drivers/media/IR/streamzap.c
+++ b/drivers/media/IR/streamzap.c
@@ -221,7 +221,7 @@ static void streamzap_callback(struct urb *urb)
struct streamzap_ir *sz;
unsigned int i;
int len;
- static int timeout = (((SZ_TIMEOUT * SZ_RESOLUTION) &
+ static int timeout = (((SZ_TIMEOUT * SZ_RESOLUTION * 1000) &
IR_MAX_DURATION) | 0x03000000);
if (!urb)
@@ -273,7 +273,7 @@ static void streamzap_callback(struct urb *urb)
struct ir_raw_event rawir;
rawir.pulse = false;
- rawir.duration = timeout * 1000;
+ rawir.duration = timeout;
sz->idle = true;
if (sz->timeout_enabled)
sz_push(sz, rawir);