media: omap3isp: Add missed v4l2_ctrl_handler_free() for preview_init_entities()

[ Upstream commit dc7690a73017e1236202022e26a6aa133f239c8c ]

preview_init_entities() does not call v4l2_ctrl_handler_free() when
it fails.
Add the missed function to fix it.

Fixes: de1135d44f4f ("[media] omap3isp: CCDC, preview engine and resizer")
Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/media/platform/omap3isp/isppreview.c b/drivers/media/platform/omap3isp/isppreview.c
index c9e8845de1b1d2829906e032dd58edbf6ed6d35e..c3336a2cbe14541220225c02f6bad6d3c2290e2c 100644 (file)
--- a/drivers/media/platform/omap3isp/isppreview.c
+++ b/drivers/media/platform/omap3isp/isppreview.c
@@ -2285,7 +2285,7 @@ static int preview_init_entities(struct isp_prev_device *prev)
        me->ops = &preview_media_ops;
        ret = media_entity_init(me, PREV_PADS_NUM, pads, 0);
        if (ret < 0)
-               return ret;
+               goto error_handler_free;
 
        preview_init_formats(sd, NULL);
 
@@ -2331,6 +2331,8 @@ error_video_out:
        omap3isp_video_cleanup(&prev->video_in);
 error_video_in:
        media_entity_cleanup(&prev->subdev.entity);
+error_handler_free:
+       v4l2_ctrl_handler_free(&prev->ctrls);
        return ret;
 }