UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

media: ti-vpe: cal: handle cal_ctx_v4l2_register error 

cal_async_notifier_complete() doesn't handle errors returned from
cal_ctx_v4l2_register(). Add the error handling.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Tomi Valkeinen 2021-06-14 13:23:31 +02:00 committed by Mauro Carvalho Chehab
parent 7d167e68d8
commit a6c9aad965
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/media/platform/ti-vpe/cal.c
View File

@ -740,15 +740,33 @@ static int cal_async_notifier_complete(struct v4l2_async_notifier *notifier)
{ {
struct cal_dev *cal = container_of(notifier, struct cal_dev, notifier); struct cal_dev *cal = container_of(notifier, struct cal_dev, notifier);
unsigned int i; unsigned int i;
int ret = 0; int ret;
for (i = 0; i < ARRAY_SIZE(cal->ctx); ++i) { for (i = 0; i < ARRAY_SIZE(cal->ctx); ++i) {
if (cal->ctx[i]) if (!cal->ctx[i])
cal_ctx_v4l2_register(cal->ctx[i]); continue;
ret = cal_ctx_v4l2_register(cal->ctx[i]);
if (ret)
goto err_ctx_unreg;
} }
if (cal_mc_api) if (!cal_mc_api)
ret = v4l2_device_register_subdev_nodes(&cal->v4l2_dev); return 0;
ret = v4l2_device_register_subdev_nodes(&cal->v4l2_dev);
if (ret)
goto err_ctx_unreg;
return 0;
err_ctx_unreg:
for (; i > 0; --i) {
if (!cal->ctx[i - 1])
continue;
cal_ctx_v4l2_unregister(cal->ctx[i - 1]);
}
return ret; return ret;
} }