1 files changed, 3 insertions, 6 deletions

diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c
index 92b8cdf9fb8..f9fda18b410 100644
--- a/drivers/media/video/cx88/cx88-input.c
+++ b/drivers/media/video/cx88/cx88-input.c
@@ -360,7 +360,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
         snprintf(ir->name, sizeof(ir->name), "cx88 IR (%s)", core->board.name);
         snprintf(ir->phys, sizeof(ir->phys), "pci-%s/ir0", pci_name(pci));
 
-        err = ir_input_init(input_dev, &ir->ir, ir_type, ir_codes);
+        err = ir_input_init(input_dev, &ir->ir, ir_type);
         if (err < 0)
                 goto err_out_free;
 
@@ -383,7 +383,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
         cx88_ir_start(core, ir);
 
         /* all done */
-        err = input_register_device(ir->input);
+        err = ir_input_register(ir->input, ir_codes);
         if (err)
                 goto err_out_stop;
 
@@ -393,8 +393,6 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
         cx88_ir_stop(core, ir);
         core->ir = NULL;
  err_out_free:
-        ir_input_free(input_dev);
-        input_free_device(input_dev);
         kfree(ir);
         return err;
 }
@@ -408,8 +406,7 @@ int cx88_ir_fini(struct cx88_core *core)
                 return 0;
 
         cx88_ir_stop(core, ir);
-        ir_input_free(ir->input);
-        input_unregister_device(ir->input);
+        ir_input_unregister(ir->input);
         kfree(ir);
 
         /* done */