On Fri, Jun 13, 2025 at 05:34:25PM +0200, Niklas Söderlund wrote:
> Prepare for more failed probe conditions that needs cleanup by
> converting the error path to use labels.
>
> Signed-off-by: Niklas Söderlund <niklas.soderlund+renesas@xxxxxxxxxxxx>
Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@xxxxxxxxxxxxxxxx>
> ---
> * Changes since v5
> - New in v6
> ---
> drivers/media/platform/renesas/rcar-vin/rcar-core.c | 11 +++++++----
> 1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/media/platform/renesas/rcar-vin/rcar-core.c b/drivers/media/platform/renesas/rcar-vin/rcar-core.c
> index 73d713868391..59751ec23a15 100644
> --- a/drivers/media/platform/renesas/rcar-vin/rcar-core.c
> +++ b/drivers/media/platform/renesas/rcar-vin/rcar-core.c
> @@ -1405,15 +1405,18 @@ static int rcar_vin_probe(struct platform_device *pdev)
> vin->scaler = vin->info->scaler;
> }
>
> - if (ret) {
> - rvin_dma_unregister(vin);
> - return ret;
> - }
> + if (ret)
> + goto err_dma;
>
> pm_suspend_ignore_children(&pdev->dev, true);
> pm_runtime_enable(&pdev->dev);
>
> return 0;
> +
> +err_dma:
> + rvin_dma_unregister(vin);
> +
> + return ret;
> }
>
> static void rcar_vin_remove(struct platform_device *pdev)
--
Regards,
Laurent Pinchart
