1 files changed, 13 insertions, 2 deletions

diff --git a/drivers/media/common/ir-functions.c b/drivers/media/common/ir-functions.c
index 16792a68a449..655474b29e21 100644
--- a/drivers/media/common/ir-functions.c
+++ b/drivers/media/common/ir-functions.c
@@ -58,13 +58,24 @@ static void ir_input_key_event(struct input_dev *dev, struct ir_input_state *ir)
 /* -------------------------------------------------------------------------- */
 
 void ir_input_init(struct input_dev *dev, struct ir_input_state *ir,
-                   int ir_type, IR_KEYTAB_TYPE *ir_codes)
+                   int ir_type, struct ir_scancode_table *ir_codes)
 {
         int i;
 
         ir->ir_type = ir_type;
+
+        memset(ir->ir_codes, sizeof(ir->ir_codes), 0);
+
+        /*
+         * FIXME: This is a temporary workaround to use the new IR tables
+         * with the old approach. Later patches will replace this to a
+         * proper method
+         */
+
         if (ir_codes)
-                memcpy(ir->ir_codes, ir_codes, sizeof(ir->ir_codes));
+                for (i = 0; i < ir_codes->size; i++)
+                        if (ir_codes->scan[i].scancode < IR_KEYTAB_SIZE)
+                                ir->ir_codes[ir_codes->scan[i].scancode] = ir_codes->scan[i].keycode;
 
         dev->keycode     = ir->ir_codes;
         dev->keycodesize = sizeof(IR_KEYTAB_TYPE);