1 files changed, 11 insertions, 2 deletions

diff --git a/drivers/media/IR/ir-keytable.c b/drivers/media/IR/ir-keytable.c
index 15a0f192d413..7e82a9df726b 100644
--- a/drivers/media/IR/ir-keytable.c
+++ b/drivers/media/IR/ir-keytable.c
@@ -339,6 +339,8 @@ void ir_repeat(struct input_dev *dev)
 
         spin_lock_irqsave(&ir->keylock, flags);
 
+        input_event(dev, EV_MSC, MSC_SCAN, ir->last_scancode);
+
         if (!ir->keypressed)
                 goto out;
 
@@ -370,6 +372,8 @@ void ir_keydown(struct input_dev *dev, int scancode, u8 toggle)
 
         spin_lock_irqsave(&ir->keylock, flags);
 
+        input_event(dev, EV_MSC, MSC_SCAN, scancode);
+
         /* Repeat event? */
         if (ir->keypressed &&
             ir->last_scancode == scancode &&
@@ -383,9 +387,11 @@ void ir_keydown(struct input_dev *dev, int scancode, u8 toggle)
         ir->last_toggle = toggle;
         ir->last_keycode = keycode;
 
+
         if (keycode == KEY_RESERVED)
                 goto out;
 
+
         /* Register a keypress */
         ir->keypressed = true;
         IR_dprintk(1, "%s: key down event, key 0x%04x, scancode 0x%04x\n",
@@ -428,7 +434,7 @@ static void ir_close(struct input_dev *input_dev)
  */
 int __ir_input_register(struct input_dev *input_dev,
                       const struct ir_scancode_table *rc_tab,
-                      const struct ir_dev_props *props,
+                      struct ir_dev_props *props,
                       const char *driver_name)
 {
         struct ir_input_dev *ir_dev;
@@ -480,6 +486,8 @@ int __ir_input_register(struct input_dev *input_dev,
 
         set_bit(EV_KEY, input_dev->evbit);
         set_bit(EV_REP, input_dev->evbit);
+        set_bit(EV_MSC, input_dev->evbit);
+        set_bit(MSC_SCAN, input_dev->mscbit);
 
         if (ir_setkeytable(input_dev, &ir_dev->rc_tab, rc_tab)) {
                 rc = -ENOMEM;
@@ -499,7 +507,8 @@ int __ir_input_register(struct input_dev *input_dev,
 
         IR_dprintk(1, "Registered input device on %s for %s remote%s.\n",
                    driver_name, rc_tab->name,
-                   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" : "");
 
         return 0;