From 0b8726fcd99234ff8c8688266e42836a8147d78a Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 17 Jul 2007 16:27:30 -0300 Subject: [PATCH] --- yaml --- r: 62275 b: refs/heads/master c: f7518bd2d9ecad8c404c300e7872f7c2ab4961ad h: refs/heads/master i: 62273: 5b7d65e602e5ea6bc3c9a22c550d5421f9e77b83 62271: 71ea3c3095cc476376177c3dbfe7dacc84502863 v: v3 --- [refs] | 2 +- trunk/drivers/media/common/ir-functions.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6e554abf6329..e99f60047128 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 09df5cbe46511611410274f09571ada229231ddb +refs/heads/master: f7518bd2d9ecad8c404c300e7872f7c2ab4961ad diff --git a/trunk/drivers/media/common/ir-functions.c b/trunk/drivers/media/common/ir-functions.c index fe447a06e24e..a3292e955aaa 100644 --- a/trunk/drivers/media/common/ir-functions.c +++ b/trunk/drivers/media/common/ir-functions.c @@ -345,8 +345,8 @@ void ir_rc5_timer_end(unsigned long data) } /* Set/reset key-up timer */ - timeout = current_jiffies + (500 + ir->rc5_key_timeout - * HZ) / 1000; + timeout = current_jiffies + + msecs_to_jiffies(ir->rc5_key_timeout); mod_timer(&ir->timer_keyup, timeout); /* Save code for repeat test */