1 files changed, 6 insertions, 1 deletions

diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c
index 9c6d0ae58b1f..64360d26b32d 100644
--- a/drivers/media/video/ir-kbd-i2c.c
+++ b/drivers/media/video/ir-kbd-i2c.c
@@ -437,7 +437,10 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
                  dev_name(&client->dev));
 
         /* init + register input device */
-        ir_input_init(input_dev, &ir->ir, ir_type, ir->ir_codes);
+        err = ir_input_init(input_dev, &ir->ir, ir_type, ir->ir_codes);
+        if (err < 0)
+                goto err_out_free;
+
         input_dev->id.bustype = BUS_I2C;
         input_dev->name       = ir->name;
         input_dev->phys       = ir->phys;
@@ -456,6 +459,7 @@ static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
         return 0;
 
  err_out_free:
+        ir_input_free(input_dev);
         input_free_device(input_dev);
         kfree(ir);
         return err;
@@ -469,6 +473,7 @@ static int ir_remove(struct i2c_client *client)
         cancel_delayed_work_sync(&ir->work);
 
         /* unregister device */
+        ir_input_free(ir->input);
         input_unregister_device(ir->input);
 
         /* free memory */