diff options
| author | Jarod Wilson <jarod@redhat.com> | 2011-06-16 17:30:48 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-01 16:33:20 -0300 |
| commit | 9800b5b619cd9a013a6f0c7d5da0dbbc17a5af30 (patch) | |
| tree | 8219b22728d90ef8db71f01bee567d9e87e1cd85 /drivers/media/video | |
| parent | 3f5c4c73322e4d6f3d40b697dac3073d2adffe41 (diff) | |
| download | op-kernel-dev-9800b5b619cd9a013a6f0c7d5da0dbbc17a5af30.zip op-kernel-dev-9800b5b619cd9a013a6f0c7d5da0dbbc17a5af30.tar.gz | |
[media] saa7134: fix raw IR timeout value
The comment says "wait 15ms", but the code says jiffies_to_msecs(15)
instead of msecs_to_jiffies(15). Fix that. Tested, works fine with both
rc5 and rc6 decode, in-kernel and via lirc userspace, with an HVR-1150.
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video')
| -rw-r--r-- | drivers/media/video/saa7134/saa7134-input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c index ff6c0e9..d4ee24b 100644 --- a/drivers/media/video/saa7134/saa7134-input.c +++ b/drivers/media/video/saa7134/saa7134-input.c @@ -963,7 +963,7 @@ static int saa7134_raw_decode_irq(struct saa7134_dev *dev) * to work with other protocols. */ if (!ir->active) { - timeout = jiffies + jiffies_to_msecs(15); + timeout = jiffies + msecs_to_jiffies(15); mod_timer(&ir->timer, timeout); ir->active = true; } |
