[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>

diff --git a/drivers/media/IR/streamzap.c b/drivers/media/IR/streamzap.c
index 623ee2dc198e9a5934434c51cfadcde4bf205a09..86a4f68feea4b563f75f72c634bc1393c0717865 100644 (file)
--- 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);