diff options
| author | Mauro Carvalho Chehab | 2009-12-11 13:47:42 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2009-12-16 03:18:44 +0100 |
| commit | 38ef6aa884e3fd389f7d444b8dd36c16832e36b4 (patch) | |
| tree | 760c7f2f9528e7bc19dbb8b5d5384d473c207a73 /drivers/media/video/ir-kbd-i2c.c | |
| parent | V4L/DVB (13615): ir-core: create ir_input_register (diff) | |
| download | kernel-qcow2-linux-38ef6aa884e3fd389f7d444b8dd36c16832e36b4.tar.gz kernel-qcow2-linux-38ef6aa884e3fd389f7d444b8dd36c16832e36b4.tar.xz kernel-qcow2-linux-38ef6aa884e3fd389f7d444b8dd36c16832e36b4.zip | |
V4L/DVB (13616): IR: rename ir_input_free as ir_input_unregister
Now, ir_input_free does more than just freeing the keytab. Better to
rename it as ir_input_unregister.
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 2856e780772e..9d8e78dc614e 100644 --- a/drivers/media/video/ir-kbd-i2c.c +++ b/drivers/media/video/ir-kbd-i2c.c @@ -460,7 +460,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id) return 0; err_out_free: - ir_input_free(input_dev); + ir_input_unregister(input_dev); input_free_device(input_dev); kfree(ir); return err; @@ -474,7 +474,7 @@ static int ir_remove(struct i2c_client *client) cancel_delayed_work_sync(&ir->work); /* unregister device */ - ir_input_free(ir->input); + ir_input_unregister(ir->input); input_unregister_device(ir->input); /* free memory */ |