Re: [PATCH v3 1/3] media: rkisp1: Properly handle result of rkisp1_params_init_vb2_queue()
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: 2025-06-05 08:25:47
Also in:
linux-media, linux-rockchip, lkml
Hi Stefan, Thank you for the patch. On Fri, May 23, 2025 at 05:14:30PM +0200, Stefan Klug wrote:
Properly handle the return of rkisp1_params_init_vb2_queue(). It is very unlikely that this ever fails without code changes but should be handled anyways. While at it rename the error label for easier extension in the upcoming patch.
I'd have kept that change for the next patch, as it's hard to review here without looking at upcoming changes. There's no need for a v4 just because of this.
Signed-off-by: Stefan Klug <redacted>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
quoted hunk ↗ jump to hunk
--- Changes in v3: - Moved these changes into its own patch --- drivers/media/platform/rockchip/rkisp1/rkisp1-params.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c index b28f4140c8a3..24a8de697f2b 100644 --- a/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c +++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-params.c@@ -2763,7 +2763,9 @@ int rkisp1_params_register(struct rkisp1_device *rkisp1) vdev->queue = &node->buf_queue; vdev->device_caps = V4L2_CAP_STREAMING | V4L2_CAP_META_OUTPUT; vdev->vfl_dir = VFL_DIR_TX; - rkisp1_params_init_vb2_queue(vdev->queue, params); + ret = rkisp1_params_init_vb2_queue(vdev->queue, params); + if (ret) + goto err_media; params->metafmt = &rkisp1_params_formats[RKISP1_PARAMS_FIXED];@@ -2777,18 +2779,18 @@ int rkisp1_params_register(struct rkisp1_device *rkisp1) node->pad.flags = MEDIA_PAD_FL_SOURCE; ret = media_entity_pads_init(&vdev->entity, 1, &node->pad); if (ret) - goto error; + goto err_media; ret = video_register_device(vdev, VFL_TYPE_VIDEO, -1); if (ret) { dev_err(rkisp1->dev, "failed to register %s, ret=%d\n", vdev->name, ret); - goto error; + goto err_media; } return 0; -error: +err_media: media_entity_cleanup(&vdev->entity); mutex_destroy(&node->vlock); return ret;
-- Regards, Laurent Pinchart