From f0bbe8736a175f495706f0c92df73cd29b1d9471 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Tue, 12 Oct 2010 10:42:08 -0300 Subject: [PATCH] --- yaml --- r: 219335 b: refs/heads/master c: b784cfcec7293f688b09d3850826216a4e134d2e h: refs/heads/master i: 219333: 9a0116611b6ae4c7ef53595d46af573d1deaf815 219331: 1280a4144ba8c331904340993815b2bd67d43a7f 219327: dd874bc383944ecd3900e644da34782452b94e5f v: v3 --- [refs] | 2 +- trunk/drivers/media/IR/streamzap.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 701a7348d756..bc9f898399db 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b768d47eb6e467b198351c0344e2e3e49c45c476 +refs/heads/master: b784cfcec7293f688b09d3850826216a4e134d2e diff --git a/trunk/drivers/media/IR/streamzap.c b/trunk/drivers/media/IR/streamzap.c index 623ee2dc198e..86a4f68feea4 100644 --- a/trunk/drivers/media/IR/streamzap.c +++ b/trunk/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);