diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2007-07-18 23:42:03 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2007-07-18 23:42:03 +0200 |
| commit | 60c5d954541482b1b5d17804bdb00a3ac65452c8 (patch) | |
| tree | 94bc01153d5762d90196a94714e7d6901b0b3a1b /linux/drivers/media/common | |
| parent | afd5335417df461fb52a41eee712bd3cdf83e452 (diff) | |
| parent | 018141ee2de19a0e46afdf440d30ca581f465011 (diff) | |
| download | mediapointer-dvb-s2-60c5d954541482b1b5d17804bdb00a3ac65452c8.tar.gz mediapointer-dvb-s2-60c5d954541482b1b5d17804bdb00a3ac65452c8.tar.bz2 | |
Merge: from master
From: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/common')
| -rw-r--r-- | linux/drivers/media/common/ir-functions.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/common/ir-functions.c b/linux/drivers/media/common/ir-functions.c index 52b216fe6..52f1949f7 100644 --- a/linux/drivers/media/common/ir-functions.c +++ b/linux/drivers/media/common/ir-functions.c @@ -353,8 +353,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 */ |