1 files changed, 6 insertions, 1 deletions

diff --git a/drivers/media/video/cx23885/cx23885-input.c b/drivers/media/video/cx23885/cx23885-input.c
index fea882d1fbc..469e083dd5f 100644
--- a/drivers/media/video/cx23885/cx23885-input.c
+++ b/drivers/media/video/cx23885/cx23885-input.c
@@ -377,7 +377,10 @@ int cx23885_input_init(struct cx23885_dev *dev)
                  cx23885_boards[dev->board].name);
         snprintf(ir->phys, sizeof(ir->phys), "pci-%s/ir0", pci_name(dev->pci));
 
-        ir_input_init(input_dev, &ir->ir, ir_type, ir_codes);
+        ret = ir_input_init(input_dev, &ir->ir, ir_type, ir_codes);
+        if (ret < 0)
+                goto err_out_free;
+
         input_dev->name = ir->name;
         input_dev->phys = ir->phys;
         input_dev->id.bustype = BUS_PCI;
@@ -404,6 +407,7 @@ err_out_stop:
         cx23885_input_ir_stop(dev);
         dev->ir_input = NULL;
 err_out_free:
+        ir_input_free(input_dev);
         input_free_device(input_dev);
         kfree(ir);
         return ret;
@@ -416,6 +420,7 @@ void cx23885_input_fini(struct cx23885_dev *dev)
 
         if (dev->ir_input == NULL)
                 return;
+        ir_input_free(dev->ir_input->dev);
         input_unregister_device(dev->ir_input->dev);
         kfree(dev->ir_input);
         dev->ir_input = NULL;