diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-11-29 06:19:59 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-12-05 15:42:21 -0500 |
commit | 055cd55601f948675006ca90362fc2bfaae90a86 (patch) | |
tree | a878c55c30b0ae30334f3523d8dd67940d32a7f3 /drivers/media/video/cx88/cx88-input.c | |
parent | 0278155c84af42d78785731263b69fb49f945ea7 (diff) |
V4L/DVB (13537): ir: Prepare the code for dynamic keycode table allocation
Currently, the IR table is initialized by calling ir_input_init(). However,
this function doesn't return any error code, nor has a function to be called
when de-initializing the IR's.
Change the return argment to integer and make sure that each driver will
handle the error code. Also adds a function to free any resources that may
be allocating there: ir_input_free().
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 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c index 7b2066415d7e..92b8cdf9fb81 100644 --- a/drivers/media/video/cx88/cx88-input.c +++ b/drivers/media/video/cx88/cx88-input.c | |||
@@ -360,7 +360,10 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci) | |||
360 | snprintf(ir->name, sizeof(ir->name), "cx88 IR (%s)", core->board.name); | 360 | snprintf(ir->name, sizeof(ir->name), "cx88 IR (%s)", core->board.name); |
361 | snprintf(ir->phys, sizeof(ir->phys), "pci-%s/ir0", pci_name(pci)); | 361 | snprintf(ir->phys, sizeof(ir->phys), "pci-%s/ir0", pci_name(pci)); |
362 | 362 | ||
363 | ir_input_init(input_dev, &ir->ir, ir_type, ir_codes); | 363 | err = ir_input_init(input_dev, &ir->ir, ir_type, ir_codes); |
364 | if (err < 0) | ||
365 | goto err_out_free; | ||
366 | |||
364 | input_dev->name = ir->name; | 367 | input_dev->name = ir->name; |
365 | input_dev->phys = ir->phys; | 368 | input_dev->phys = ir->phys; |
366 | input_dev->id.bustype = BUS_PCI; | 369 | input_dev->id.bustype = BUS_PCI; |
@@ -390,6 +393,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci) | |||
390 | cx88_ir_stop(core, ir); | 393 | cx88_ir_stop(core, ir); |
391 | core->ir = NULL; | 394 | core->ir = NULL; |
392 | err_out_free: | 395 | err_out_free: |
396 | ir_input_free(input_dev); | ||
393 | input_free_device(input_dev); | 397 | input_free_device(input_dev); |
394 | kfree(ir); | 398 | kfree(ir); |
395 | return err; | 399 | return err; |
@@ -404,6 +408,7 @@ int cx88_ir_fini(struct cx88_core *core) | |||
404 | return 0; | 408 | return 0; |
405 | 409 | ||
406 | cx88_ir_stop(core, ir); | 410 | cx88_ir_stop(core, ir); |
411 | ir_input_free(ir->input); | ||
407 | input_unregister_device(ir->input); | 412 | input_unregister_device(ir->input); |
408 | kfree(ir); | 413 | kfree(ir); |
409 | 414 | ||