1 files changed, 9 insertions, 2 deletions

diff --git a/drivers/media/video/adp1653.c b/drivers/media/video/adp1653.c
index 8ad89ffe2cc3..279d75d38188 100644
--- a/drivers/media/video/adp1653.c
+++ b/drivers/media/video/adp1653.c
@@ -429,12 +429,19 @@ static int adp1653_probe(struct i2c_client *client,
         flash->subdev.internal_ops = &adp1653_internal_ops;
         flash->subdev.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE;
 
-        adp1653_init_controls(flash);
+        ret = adp1653_init_controls(flash);
+        if (ret)
+                goto free_and_quit;
 
         ret = media_entity_init(&flash->subdev.entity, 0, NULL, 0);
         if (ret < 0)
-                kfree(flash);
+                goto free_and_quit;
 
+        return 0;
+
+free_and_quit:
+        v4l2_ctrl_handler_free(&flash->ctrls);
+        kfree(flash);
         return ret;
 }