V4L/DVB: ir-core: improve keyup/keydown logic

[net-next-2.6.git] / drivers / media / IR / ir-nec-decoder.c

diff --git a/drivers/media/IR/ir-nec-decoder.c b/drivers/media/IR/ir-nec-decoder.c
index 83a9912722f4fc580d428921481f8538ed89b446..0b50060ffbafae18cb5e76af93f477943fe71f93 100644 (file)
--- a/drivers/media/IR/ir-nec-decoder.c
+++ b/drivers/media/IR/ir-nec-decoder.c
@@ -180,8 +180,7 @@ static int __ir_nec_decode(struct input_dev *input_dev,
        if (is_repeat(evs, len, *pos)) {
                *pos += 2;
                if (ir->keypressed) {
-                       mod_timer(&ir->raw->timer_keyup,
-                               jiffies + msecs_to_jiffies(REPEAT_TIME));
+                       ir_repeat(input_dev);
                        IR_dprintk(1, "NEC repeat event\n");
                        return 1;
                } else {
@@ -238,9 +237,7 @@ static int __ir_nec_decode(struct input_dev *input_dev,
        }
 
        IR_dprintk(1, "NEC scancode 0x%04x\n", ircode);
-       ir_keydown(input_dev, ircode);
-       mod_timer(&ir->raw->timer_keyup,
-                 jiffies + msecs_to_jiffies(REPEAT_TIME));
+       ir_keydown(input_dev, ircode, 0);
 
        return 1;
 err: