aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLawrence Rust <lvr@softsystem.co.uk>2011-04-08 09:50:45 -0300
committerGreg Kroah-Hartman <gregkh@suse.de>2011-05-21 15:13:31 -0700
commit55285e0fd90b9cf00276f66bb491e28ecdee11d9 (patch)
tree8f419de10f03582989a6b6504c7b0848eb7f856f
parentc0f0a12212ed64f082b3700dab1f8e72f6227004 (diff)
downloadlinux-2.6.38-lt-ux500-55285e0fd90b9cf00276f66bb491e28ecdee11d9.tar.gz
Fix cx88 remote control input
commit 2a164d02dd34c6b49a3f0995900e0f8af102b804 upstream. In the IR interrupt handler of cx88-input.c there's a 32-bit multiply overflow which causes IR pulse durations to be incorrectly calculated. This is a regression caused by commit 2997137be8eba. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/media/video/cx88/cx88-input.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c
index ac4f8e0750e..67a2b086101 100644
--- a/drivers/media/video/cx88/cx88-input.c
+++ b/drivers/media/video/cx88/cx88-input.c
@@ -523,7 +523,7 @@ void cx88_ir_irq(struct cx88_core *core)
for (todo = 32; todo > 0; todo -= bits) {
ev.pulse = samples & 0x80000000 ? false : true;
bits = min(todo, 32U - fls(ev.pulse ? samples : ~samples));
- ev.duration = (bits * NSEC_PER_SEC) / (1000 * ir_samplerate);
+ ev.duration = (bits * (NSEC_PER_SEC / 1000)) / ir_samplerate;
ir_raw_event_store_with_filter(ir->dev, &ev);
samples <<= bits;
}