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 git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
[pandora-kernel.git]
/
drivers
/
media
/
IR
/
ir-keytable.c
diff --git
a/drivers/media/IR/ir-keytable.c
b/drivers/media/IR/ir-keytable.c
index
7e82a9d
..
7961d59
100644
(file)
--- a/
drivers/media/IR/ir-keytable.c
+++ b/
drivers/media/IR/ir-keytable.c
@@
-319,7
+319,7
@@
static void ir_timer_keyup(unsigned long cookie)
* a keyup event might follow immediately after the keydown.
*/
spin_lock_irqsave(&ir->keylock, flags);
* a keyup event might follow immediately after the keydown.
*/
spin_lock_irqsave(&ir->keylock, flags);
- if (time_is_
after
_eq_jiffies(ir->keyup_jiffies))
+ if (time_is_
before
_eq_jiffies(ir->keyup_jiffies))
ir_keyup(ir);
spin_unlock_irqrestore(&ir->keylock, flags);
}
ir_keyup(ir);
spin_unlock_irqrestore(&ir->keylock, flags);
}
@@
-510,6
+510,13
@@
int __ir_input_register(struct input_dev *input_dev,
(ir_dev->props && ir_dev->props->driver_type == RC_DRIVER_IR_RAW) ?
" in raw mode" : "");
(ir_dev->props && ir_dev->props->driver_type == RC_DRIVER_IR_RAW) ?
" in raw mode" : "");
+ /*
+ * Default delay of 250ms is too short for some protocols, expecially
+ * since the timeout is currently set to 250ms. Increase it to 500ms,
+ * to avoid wrong repetition of the keycodes.
+ */
+ input_dev->rep[REP_DELAY] = 500;
+
return 0;
out_event:
return 0;
out_event: