git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
drivers
/
media
/
video
/
saa7134
/
saa7134-input.c
diff --git
a/drivers/media/video/saa7134/saa7134-input.c
b/drivers/media/video/saa7134/saa7134-input.c
index
ff6c0e9
..
d4ee24b
100644
(file)
--- 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_msec
s(15);
+ timeout = jiffies +
msecs_to_jiffie
s(15);
mod_timer(&ir->timer, timeout);
ir->active = true;
}