| From 2a5c9cb1643d8549ffbc8fb22e2c476c96075a9c Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 3 Jun 2020 18:41:22 +0200 |
| Subject: media: omap3isp: Add missed v4l2_ctrl_handler_free() for |
| preview_init_entities() |
| |
| From: Chuhong Yuan <hslester96@gmail.com> |
| |
| [ 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> |
| --- |
| drivers/media/platform/omap3isp/isppreview.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/media/platform/omap3isp/isppreview.c b/drivers/media/platform/omap3isp/isppreview.c |
| index 4dbdf3180d108..607b7685c982f 100644 |
| --- a/drivers/media/platform/omap3isp/isppreview.c |
| +++ b/drivers/media/platform/omap3isp/isppreview.c |
| @@ -2287,7 +2287,7 @@ static int preview_init_entities(struct isp_prev_device *prev) |
| me->ops = &preview_media_ops; |
| ret = media_entity_pads_init(me, PREV_PADS_NUM, pads); |
| if (ret < 0) |
| - return ret; |
| + goto error_handler_free; |
| |
| preview_init_formats(sd, NULL); |
| |
| @@ -2320,6 +2320,8 @@ static int preview_init_entities(struct isp_prev_device *prev) |
| 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; |
| } |
| |
| -- |
| 2.25.1 |
| |
