[media] mt9v032: Free control handler in cleanup paths

The control handler must be freed in the probe error path and in the
remove handler.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/i2c/mt9v032.c b/drivers/media/i2c/mt9v032.c
index 3f356cb282567e882361b7958146090d9092cb43..24ea6fd3ee8139abb387a4a2d5c63b9ac662fe0a 100644 (file)
--- a/drivers/media/i2c/mt9v032.c
+++ b/drivers/media/i2c/mt9v032.c
@@ -830,8 +830,11 @@ static int mt9v032_probe(struct i2c_client *client,
 
        mt9v032->pad.flags = MEDIA_PAD_FL_SOURCE;
        ret = media_entity_init(&mt9v032->subdev.entity, 1, &mt9v032->pad, 0);
-       if (ret < 0)
+
+       if (ret < 0) {
+               v4l2_ctrl_handler_free(&mt9v032->ctrls);
                kfree(mt9v032);
+       }
 
        return ret;
 }
@@ -841,9 +844,11 @@ static int mt9v032_remove(struct i2c_client *client)
        struct v4l2_subdev *subdev = i2c_get_clientdata(client);
        struct mt9v032 *mt9v032 = to_mt9v032(subdev);
 
+       v4l2_ctrl_handler_free(&mt9v032->ctrls);
        v4l2_device_unregister_subdev(subdev);
        media_entity_cleanup(&subdev->entity);
        kfree(mt9v032);
+
        return 0;
 }