Several I2C IR's only provide part of the IR protocol message (in general,
they provide only the command part). Due to that, some props fields need
to be specified.

Signed-off-by: Mauro Carvalho Chehab <mche...@redhat.com>

diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index aee8943..82834ea 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -270,6 +270,7 @@ static int ir_probe(struct i2c_client *client, const struct 
i2c_device_id *id)
 {
        char *ir_codes = NULL;
        const char *name = NULL;
+       struct ir_dev_props *props = NULL;
        u64 ir_type = IR_TYPE_UNKNOWN;
        struct IR_i2c *ir;
        struct input_dev *input_dev;
@@ -337,6 +338,7 @@ static int ir_probe(struct i2c_client *client, const struct 
i2c_device_id *id)
                name = init_data->name;
                if (init_data->type)
                        ir_type = init_data->type;
+               props = init_data->props;
 
                if (init_data->polling_interval)
                        ir->polling_interval = init_data->polling_interval;
@@ -388,7 +390,7 @@ static int ir_probe(struct i2c_client *client, const struct 
i2c_device_id *id)
        input_dev->name       = ir->name;
        input_dev->phys       = ir->phys;
 
-       err = ir_input_register(ir->input, ir->ir_codes, NULL, MODULE_NAME);
+       err = ir_input_register(ir->input, ir->ir_codes, props, MODULE_NAME);
        if (err)
                goto err_out_free;
 
diff --git a/include/media/ir-kbd-i2c.h b/include/media/ir-kbd-i2c.h
index 8c37b5e..19ea5fa 100644
--- a/include/media/ir-kbd-i2c.h
+++ b/include/media/ir-kbd-i2c.h
@@ -47,5 +47,7 @@ struct IR_i2c_init_data {
         */
        int                    (*get_key)(struct IR_i2c*, u32*, u32*);
        enum ir_kbd_get_key_fn internal_get_key_func;
+
+       struct ir_dev_props    *props;
 };
 #endif
-- 
1.7.1


--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to