media: omap3isp: Add missed v4l2_ctrl_handler_free() for preview_init_entities()
[ Upstream commitdc7690a730
] preview_init_entities() does not call v4l2_ctrl_handler_free() when it fails. Add the missed function to fix it. Fixes:de1135d44f
("[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>
This commit is contained in:
parent
8fe0119f5c
commit
d85cebc865
|
@ -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 @@ 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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue