diff options
| author | Mauro Carvalho Chehab | 2009-12-14 04:16:55 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2010-02-26 19:10:23 +0100 |
| commit | e93854da880d6dc357c00625d8371b6a926fd19b (patch) | |
| tree | 8bf87df8cf639fe7af7e35fb5cbc42792742a31b /drivers/media/video/ir-kbd-i2c.c | |
| parent | V4L/DVB (13633): ir-core: create a new class for remote controllers (diff) | |
| download | kernel-qcow2-linux-e93854da880d6dc357c00625d8371b6a926fd19b.tar.gz kernel-qcow2-linux-e93854da880d6dc357c00625d8371b6a926fd19b.tar.xz kernel-qcow2-linux-e93854da880d6dc357c00625d8371b6a926fd19b.zip | |
V4L/DVB (13634): ir-core: allow passing IR device parameters to ir-core
Adds an structure to ir_input_register to contain IR device characteristics,
like supported protocols and a callback to handle protocol event changes.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/ir-kbd-i2c.c')
| -rw-r--r-- | drivers/media/video/ir-kbd-i2c.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c index b86e35386cee..4cd75a3c47d1 100644 --- a/drivers/media/video/ir-kbd-i2c.c +++ b/drivers/media/video/ir-kbd-i2c.c @@ -299,7 +299,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id) { struct ir_scancode_table *ir_codes = NULL; const char *name = NULL; - int ir_type = 0; + enum ir_type ir_type = 0; struct IR_i2c *ir; struct input_dev *input_dev; struct i2c_adapter *adap = client->adapter; @@ -446,7 +446,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); + err = ir_input_register(ir->input, ir->ir_codes, NULL); if (err) goto err_out_free; |