diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-12-11 07:47:42 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-12-15 21:18:44 -0500 |
commit | 38ef6aa884e3fd389f7d444b8dd36c16832e36b4 (patch) | |
tree | 760c7f2f9528e7bc19dbb8b5d5384d473c207a73 /drivers/media/video/ir-kbd-i2c.c | |
parent | 75543cce0c1f46be495b981d8d3eda0882721d07 (diff) |
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) | |||
460 | return 0; | 460 | return 0; |
461 | 461 | ||
462 | err_out_free: | 462 | err_out_free: |
463 | ir_input_free(input_dev); | 463 | ir_input_unregister(input_dev); |
464 | input_free_device(input_dev); | 464 | input_free_device(input_dev); |
465 | kfree(ir); | 465 | kfree(ir); |
466 | return err; | 466 | return err; |
@@ -474,7 +474,7 @@ static int ir_remove(struct i2c_client *client) | |||
474 | cancel_delayed_work_sync(&ir->work); | 474 | cancel_delayed_work_sync(&ir->work); |
475 | 475 | ||
476 | /* unregister device */ | 476 | /* unregister device */ |
477 | ir_input_free(ir->input); | 477 | ir_input_unregister(ir->input); |
478 | input_unregister_device(ir->input); | 478 | input_unregister_device(ir->input); |
479 | 479 | ||
480 | /* free memory */ | 480 | /* free memory */ |