From: Jarod Wilson Date: Thu, 16 Jun 2011 20:30:48 +0000 (-0300) Subject: [media] saa7134: fix raw IR timeout value X-Git-Tag: v3.0-rc7~2^2~17 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9800b5b619cd9a013a6f0c7d5da0dbbc17a5af30;p=platform%2Fupstream%2Fkernel-adaptation-pc.git [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 Signed-off-by: Mauro Carvalho Chehab --- 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; }