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/em28xx/em28xx-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/em28xx/em28xx-input.c')
-rw-r--r-- | drivers/media/video/em28xx/em28xx-input.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/em28xx/em28xx-input.c b/drivers/media/video/em28xx/em28xx-input.c index 5ddeb421ed58..9dc4e142726b 100644 --- a/drivers/media/video/em28xx/em28xx-input.c +++ b/drivers/media/video/em28xx/em28xx-input.c | |||
@@ -422,7 +422,7 @@ int em28xx_ir_init(struct em28xx *dev) | |||
422 | em28xx_ir_stop(ir); | 422 | em28xx_ir_stop(ir); |
423 | dev->ir = NULL; | 423 | dev->ir = NULL; |
424 | err_out_free: | 424 | err_out_free: |
425 | ir_input_free(input_dev); | 425 | ir_input_unregister(input_dev); |
426 | input_free_device(input_dev); | 426 | input_free_device(input_dev); |
427 | kfree(ir); | 427 | kfree(ir); |
428 | return err; | 428 | return err; |
@@ -437,7 +437,7 @@ int em28xx_ir_fini(struct em28xx *dev) | |||
437 | return 0; | 437 | return 0; |
438 | 438 | ||
439 | em28xx_ir_stop(ir); | 439 | em28xx_ir_stop(ir); |
440 | ir_input_free(ir->input); | 440 | ir_input_unregister(ir->input); |
441 | input_unregister_device(ir->input); | 441 | input_unregister_device(ir->input); |
442 | kfree(ir); | 442 | kfree(ir); |
443 | 443 | ||