Merge branch 'atmel'

[linux-2.6-omap-h63xx.git] / drivers / media / common / ir-common.c

diff --git a/drivers/media/common/ir-common.c b/drivers/media/common/ir-common.c
index a0e700d7a4a4ad5b5fb6c3ff7b052ff1b0449791..4b71fd6f7aed15b5ecf0382fcd8e622c2176d3c7 100644 (file)
--- a/drivers/media/common/ir-common.c
+++ b/drivers/media/common/ir-common.c
@@ -22,6 +22,7 @@
 
 #include <linux/module.h>
 #include <linux/moduleparam.h>
+#include <linux/string.h>
 #include <media/ir-common.h>
 
 /* -------------------------------------------------------------------------- */
@@ -115,7 +116,7 @@ IR_KEYTAB_TYPE ir_codes_winfast[IR_KEYTAB_SIZE] = {
        [ 46 ] = KEY_BLUE,
        [ 24 ] = KEY_KPPLUS,            /* fine tune + */
        [ 25 ] = KEY_KPMINUS,           /* fine tune - */
-        [ 33 ] = KEY_KPDOT,
+       [ 33 ] = KEY_KPDOT,
        [ 19 ] = KEY_KPENTER,
        [ 34 ] = KEY_BACK,
        [ 35 ] = KEY_PLAYPAUSE,
@@ -238,7 +239,7 @@ static void ir_input_key_event(struct input_dev *dev, struct ir_input_state *ir)
        dprintk(1,"%s: key event code=%d down=%d\n",
                dev->name,ir->keycode,ir->keypressed);
        input_report_key(dev,ir->keycode,ir->keypressed);
-        input_sync(dev);
+       input_sync(dev);
 }
 
 /* -------------------------------------------------------------------------- */
@@ -252,7 +253,6 @@ void ir_input_init(struct input_dev *dev, struct ir_input_state *ir,
        if (ir_codes)
                memcpy(ir->ir_codes, ir_codes, sizeof(ir->ir_codes));
 
-        init_input_dev(dev);
        dev->keycode     = ir->ir_codes;
        dev->keycodesize = sizeof(IR_KEYTAB_TYPE);
        dev->keycodemax  = IR_KEYTAB_SIZE;