diff options
| author | Chuhong Yuan <hslester96@gmail.com> | 2020-06-03 18:41:22 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-08-19 08:14:55 +0200 |
| commit | 7af83dfb6e30260f80ca844b070f5e4fd86adaed (patch) | |
| tree | 36e060f55dc8b7aa69a1b2e75c7e23f8b90bb87a /drivers/media | |
| parent | 125ec9008e56a201d2d845384872bf05110191d0 (diff) | |
| download | linux-stable-7af83dfb6e30260f80ca844b070f5e4fd86adaed.tar.gz linux-stable-7af83dfb6e30260f80ca844b070f5e4fd86adaed.tar.bz2 linux-stable-7af83dfb6e30260f80ca844b070f5e4fd86adaed.zip | |
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>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/platform/omap3isp/isppreview.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/platform/omap3isp/isppreview.c b/drivers/media/platform/omap3isp/isppreview.c index 591c6de498f8..20857ae42a77 100644 --- a/drivers/media/platform/omap3isp/isppreview.c +++ b/drivers/media/platform/omap3isp/isppreview.c @@ -2290,7 +2290,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); @@ -2323,6 +2323,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; } |