media: renesas: Fix missing media_entity_cleanup()
Subsystems (4)
v3 cover media: renesas: Fix missing media_entity_cleanup()
*** BLURB HERE ***
Biren Pandya (4):
media: renesas: rcar-csi2: Add missing media_entity_cleanup()
media: renesas: csisp: Add missing media_entity_cleanup()
media: renesas: rcar-core: Add missing media_entity_cleanup()
media: renesas: rzg2l-core: Add missing media_entity_cleanup()
drivers/media/platform/renesas/rcar-csi2.c | 2 ++ drivers/media/platform/renesas/rcar-isp/csisp.c | 5 ++++- drivers/media/platform/renesas/rcar-vin/rcar-core.c | 5 ++++- drivers/media/platform/renesas/rzg2l-cru/rzg2l-core.c | 1 + 4 files changed, 11 insertions(+), 2 deletions(-)
Signature · 1 line
2.50.1 (Apple Git-155)
PATCH v3 1/4 media: renesas: rcar-csi2: Add missing media_entity_cleanup()
The probe error paths and remove function are missing calls to media_entity_cleanup(). Add them.
--- drivers/media/platform/renesas/rcar-csi2.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/media/platform/renesas/rcar-csi2.c +2 -0
@@ -2631,6 +2631,7 @@ static int rcsi2_probe(struct platform_device *pdev)v4l2_subdev_cleanup (&priv->subdev); error_pm_runtime:pm_runtime_disable (&pdev->dev); +media_entity_cleanup (&priv->subdev.entity); error_async:v4l2_async_nf_unregister (&priv->notifier);v4l2_async_nf_cleanup (&priv->notifier);
@@ -2646,6 +2647,7 @@ static void rcsi2_remove(struct platform_device *pdev)v4l2_async_nf_cleanup (&priv->notifier);v4l2_async_unregister_subdev (&priv->subdev);v4l2_subdev_cleanup (&priv->subdev); +media_entity_cleanup (&priv->subdev.entity);pm_runtime_disable (&pdev->dev); }
Signature · 1 line
2.50.1 (Apple Git-155)
PATCH v3 2/4 media: renesas: csisp: Add missing media_entity_cleanup()
In reply to Biren PandyaThe probe error path and remove function are missing calls to media_entity_cleanup(). Add a dedicated error_entity label so the cleanup is only invoked when media_entity_pads_init() has actually succeeded. This ensures that the teardown logic properly mirrors initialization.
--- drivers/media/platform/renesas/rcar-isp/csisp.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/media/platform/renesas/rcar-isp/csisp.c +4 -1
@@ -539,7 +539,7 @@ static int risp_probe(struct platform_device *pdev) ret =v4l2_subdev_init_finalize (&isp->subdev);if (ret) - goto error_notifier; + goto error_entity; ret =v4l2_async_register_subdev (&isp->subdev);if (ret <0 )
@@ -551,6 +551,8 @@ static int risp_probe(struct platform_device *pdev) error_subdev:v4l2_subdev_cleanup (&isp->subdev); +error_entity: +media_entity_cleanup (&isp->subdev.entity); error_notifier:v4l2_async_nf_unregister (&isp->notifier);v4l2_async_nf_cleanup (&isp->notifier);
@@ -569,6 +571,7 @@ static void risp_remove(struct platform_device *pdev)v4l2_async_unregister_subdev (&isp->subdev);v4l2_subdev_cleanup (&isp->subdev); +media_entity_cleanup (&isp->subdev.entity);pm_runtime_disable (&pdev->dev); }
Signature · 1 line
2.50.1 (Apple Git-155)
PATCH v3 3/4 media: renesas: rcar-core: Add missing media_entity_cleanup()
In reply to Biren PandyaThe probe error path and remove function are missing calls to media_entity_cleanup(). Add a dedicated err_entity label so the cleanup is only invoked when media_entity_pads_init() has actually succeeded. This ensures that the teardown logic properly mirrors initialization.
--- drivers/media/platform/renesas/rcar-vin/rcar-core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/media/platform/renesas/rcar-vin/rcar-core.c +4 -1
@@ -1211,7 +1211,7 @@ static int rcar_vin_probe(struct platform_device *pdev) ret =rvin_create_controls (vin);if (ret <0 ) - goto err_id; + goto err_entity;switch (vin->info->model) {case RCAR_GEN3 :
@@ -1246,6 +1246,8 @@ static int rcar_vin_probe(struct platform_device *pdev) err_ctrl:rvin_free_controls (vin); +err_entity: +media_entity_cleanup (&vin->vdev.entity); err_id:rvin_id_put (vin); err_dma:
@@ -1270,6 +1272,7 @@ static void rcar_vin_remove(struct platform_device *pdev)rvin_group_put (vin);rvin_free_controls (vin); +media_entity_cleanup (&vin->vdev.entity);rvin_id_put (vin);
Signature · 1 line
2.50.1 (Apple Git-155)
PATCH v3 4/4 media: renesas: rzg2l-core: Add missing media_entity_cleanup()
In reply to Biren PandyaThe remove function is missing a call to media_entity_cleanup(). Add it.
--- drivers/media/platform/renesas/rzg2l-cru/rzg2l-core.c | 1 + 1 file changed, 1 insertion(+)
drivers/media/platform/renesas/rzg2l-cru/rzg2l-core.c +1 -0
@@ -312,6 +312,7 @@ static void rzg2l_cru_remove(struct platform_device *pdev)v4l2_async_nf_cleanup (&cru->notifier);rzg2l_cru_video_unregister (cru); +media_entity_cleanup (&cru->vdev.entity);media_device_cleanup (&cru->mdev);mutex_destroy (&cru->mdev_lock);
Signature · 1 line
2.50.1 (Apple Git-155)
Hi Biren Pandya,
Quoted 6 lines
-----Original Message-----
From: Biren Pandya <[email protected]>
Sent: 22 June 2026 18:34
Subject: [PATCH v3 0/4] media: renesas: Fix missingmedia_entity_cleanup()*** BLURB HERE ***
Consider patch series description next time.
Cheers,
Biju
Quoted 16 lines
Biren Pandya (4):
media: renesas: rcar-csi2: Add missingmedia_entity_cleanup()
media: renesas: csisp: Add missingmedia_entity_cleanup()
media: renesas: rcar-core: Add missingmedia_entity_cleanup()
media: renesas: rzg2l-core: Add missingmedia_entity_cleanup()drivers/media/platform/renesas/rcar-csi2.c | 2 ++ drivers/media/platform/renesas/rcar-isp/csisp.c | 5 ++++- drivers/media/platform/renesas/rcar-vin/rcar-core.c | 5 ++++- drivers/media/platform/renesas/rzg2l-cru/rzg2l-core.c | 1 + 4 files changed, 11 insertions(+), 2 deletions(-)--
2.50.1 (Apple Git-155)
Quoted 8 lines · Biju Das
Hi Biren Pandya,
Quoted 5 lines
-----Original Message-----
From: Biren Pandya <[email protected]>
Sent: 22 June 2026 18:34
Subject: [PATCH v3 0/4] media: renesas: Fix missingmedia_entity_cleanup()
Quoted 7 lines
Quoted 1 line
*** BLURB HERE ***
Consider patch series description next time.
Cheers,
Biju
Hi Biju,
Apologies, I left the git-format-patch placeholder in by mistake — still learning the tricks of the game; I'll fill in the cover letter next time. Thanks for the nudge.
For the record: the series adds the missing media_entity_cleanup() calls to the Renesas media drivers (rcar-csi2, csisp, rcar-vin, rzg2l-cru), which initialise the entity but never clean it up on probe error paths or in remove(). It's a no-op today, so no functional change and no backport.
Thanks,
Biren