From ab08f859e1206772369f1f1249bf7b90a169fcfd Mon Sep 17 00:00:00 2001 From: Jarod Wilson Date: Thu, 16 Jun 2011 17:30:48 -0300 Subject: [PATCH] --- yaml --- r: 254647 b: refs/heads/master c: 9800b5b619cd9a013a6f0c7d5da0dbbc17a5af30 h: refs/heads/master i: 254645: 6ee12291c5380eaa3e37c68ae694e746a1fd34b0 254643: b1f47401da866c9002550b22896a68b0ea5ec067 254639: 729f2882ff8c0f05e67fd6f08ce3d435a90908f9 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/saa7134/saa7134-input.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 553773f46a23..89b858a3f34a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f5c4c73322e4d6f3d40b697dac3073d2adffe41 +refs/heads/master: 9800b5b619cd9a013a6f0c7d5da0dbbc17a5af30 diff --git a/trunk/drivers/media/video/saa7134/saa7134-input.c b/trunk/drivers/media/video/saa7134/saa7134-input.c index ff6c0e97563e..d4ee24bf6928 100644 --- a/trunk/drivers/media/video/saa7134/saa7134-input.c +++ b/trunk/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; }