diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-17 15:27:30 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-20 16:35:49 -0400 |
| commit | f7518bd2d9ecad8c404c300e7872f7c2ab4961ad (patch) | |
| tree | 8143e30d8fc105ac9361ffc10066137c34c1f585 /drivers/media | |
| parent | 09df5cbe46511611410274f09571ada229231ddb (diff) | |
V4L/DVB (5859): use msecs_to_jiffies on InfraRed RC5 timeout
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/common/ir-functions.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/common/ir-functions.c b/drivers/media/common/ir-functions.c index fe447a06e24e..a3292e955aaa 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) | |||
| 345 | } | 345 | } |
| 346 | 346 | ||
| 347 | /* Set/reset key-up timer */ | 347 | /* Set/reset key-up timer */ |
| 348 | timeout = current_jiffies + (500 + ir->rc5_key_timeout | 348 | timeout = current_jiffies + |
| 349 | * HZ) / 1000; | 349 | msecs_to_jiffies(ir->rc5_key_timeout); |
| 350 | mod_timer(&ir->timer_keyup, timeout); | 350 | mod_timer(&ir->timer_keyup, timeout); |
| 351 | 351 | ||
| 352 | /* Save code for repeat test */ | 352 | /* Save code for repeat test */ |