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/bt8xx/bttv-input.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/bt8xx/bttv-input.c')
-rw-r--r-- | drivers/media/video/bt8xx/bttv-input.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/bt8xx/bttv-input.c b/drivers/media/video/bt8xx/bttv-input.c index 84a957e52c4b..0e1a7aabefba 100644 --- a/drivers/media/video/bt8xx/bttv-input.c +++ b/drivers/media/video/bt8xx/bttv-input.c | |||
@@ -403,7 +403,7 @@ int bttv_input_init(struct bttv *btv) | |||
403 | bttv_ir_stop(btv); | 403 | bttv_ir_stop(btv); |
404 | btv->remote = NULL; | 404 | btv->remote = NULL; |
405 | err_out_free: | 405 | err_out_free: |
406 | ir_input_free(input_dev); | 406 | ir_input_unregister(input_dev); |
407 | input_free_device(input_dev); | 407 | input_free_device(input_dev); |
408 | kfree(ir); | 408 | kfree(ir); |
409 | return err; | 409 | return err; |
@@ -415,7 +415,7 @@ void bttv_input_fini(struct bttv *btv) | |||
415 | return; | 415 | return; |
416 | 416 | ||
417 | bttv_ir_stop(btv); | 417 | bttv_ir_stop(btv); |
418 | ir_input_free(btv->remote->dev); | 418 | ir_input_unregister(btv->remote->dev); |
419 | input_unregister_device(btv->remote->dev); | 419 | input_unregister_device(btv->remote->dev); |
420 | kfree(btv->remote); | 420 | kfree(btv->remote); |
421 | btv->remote = NULL; | 421 | btv->remote = NULL; |