[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20250522154210.GT12514@pendragon.ideasonboard.com>
Date: Thu, 22 May 2025 17:42:10 +0200
From: Laurent Pinchart <laurent.pinchart@...asonboard.com>
To: Stefan Klug <stefan.klug@...asonboard.com>
Cc: linux-media@...r.kernel.org, Dafna Hirschfeld <dafna@...tmail.com>,
Mauro Carvalho Chehab <mchehab@...nel.org>,
Heiko Stuebner <heiko@...ech.de>,
linux-rockchip@...ts.infradead.org,
linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH 1/3] media: rkisp1: Cleanup error handling
Hi Stefan,
Thank you for the patch.
On Thu, May 22, 2025 at 05:08:38PM +0200, Stefan Klug wrote:
> Do not call media_entity_cleanup() when media_entity_pads_init() fails.
Why is it an issue ? The media_entity_cleanup() documentation clearly
states
* Calling media_entity_cleanup() on a media_entity whose memory has been
* zeroed but that has not been initialized with media_entity_pad_init() is
* valid and is a no-op.
This is by design to simplify error handling in drivers.
> As a drive-by fix handle an (very unlikely) error in
> rkisp1_params_init_vb2_queue().
>
> Signed-off-by: Stefan Klug <stefan.klug@...asonboard.com>
> ---
> .../media/platform/rockchip/rkisp1/rkisp1-params.c | 11 +++++++----
> 1 file changed, 7 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..918eb06c7465 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_mutex;
>
> params->metafmt = &rkisp1_params_formats[RKISP1_PARAMS_FIXED];
>
> @@ -2777,19 +2779,20 @@ 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_mutex;
>
> 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);
> +err_mutex:
> mutex_destroy(&node->vlock);
> return ret;
> }
--
Regards,
Laurent Pinchart
Powered by blists - more mailing lists