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/cx88/cx88-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/cx88/cx88-input.c')
-rw-r--r-- | drivers/media/video/cx88/cx88-input.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c index 92b8cdf9fb81..d4dc2c2a3cbc 100644 --- a/drivers/media/video/cx88/cx88-input.c +++ b/drivers/media/video/cx88/cx88-input.c | |||
@@ -393,7 +393,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci) | |||
393 | cx88_ir_stop(core, ir); | 393 | cx88_ir_stop(core, ir); |
394 | core->ir = NULL; | 394 | core->ir = NULL; |
395 | err_out_free: | 395 | err_out_free: |
396 | ir_input_free(input_dev); | 396 | ir_input_unregister(input_dev); |
397 | input_free_device(input_dev); | 397 | input_free_device(input_dev); |
398 | kfree(ir); | 398 | kfree(ir); |
399 | return err; | 399 | return err; |
@@ -408,7 +408,7 @@ int cx88_ir_fini(struct cx88_core *core) | |||
408 | return 0; | 408 | return 0; |
409 | 409 | ||
410 | cx88_ir_stop(core, ir); | 410 | cx88_ir_stop(core, ir); |
411 | ir_input_free(ir->input); | 411 | ir_input_unregister(ir->input); |
412 | input_unregister_device(ir->input); | 412 | input_unregister_device(ir->input); |
413 | kfree(ir); | 413 | kfree(ir); |
414 | 414 | ||