From: Mauro Carvalho Chehab Date: Tue, 17 Jul 2007 19:27:30 +0000 (-0300) Subject: V4L/DVB (5859): use msecs_to_jiffies on InfraRed RC5 timeout X-Git-Tag: v2.6.23-rc1~193^2~9 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f7518bd2d9ecad8c404c300e7872f7c2ab4961ad;p=linux-2.6-omap-h63xx.git V4L/DVB (5859): use msecs_to_jiffies on InfraRed RC5 timeout Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/common/ir-functions.c b/drivers/media/common/ir-functions.c index fe447a06e24..a3292e955aa 100644 --- a/drivers/media/common/ir-functions.c +++ b/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 */