[PATCH] drm/ipuv3/parallel: Fix an error handling path in imx_pd_probe()

Christophe JAILLET posted 1 patch 2 months, 3 weeks ago
drivers/gpu/drm/imx/ipuv3/parallel-display.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
[PATCH] drm/ipuv3/parallel: Fix an error handling path in imx_pd_probe()
Posted by Christophe JAILLET 2 months, 3 weeks ago
If component_add() fails, we need to undo a potential previous
drm_edid_alloc() call.

Add an error handling path and the missing drm_edid_free(), as already done
in the reomve function.

Fixes: 42e08287a318 ("drm/ipuv3/parallel: convert to struct drm_edid")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
 drivers/gpu/drm/imx/ipuv3/parallel-display.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/imx/ipuv3/parallel-display.c b/drivers/gpu/drm/imx/ipuv3/parallel-display.c
index 91d7808a2d8d..6d51203f7f0f 100644
--- a/drivers/gpu/drm/imx/ipuv3/parallel-display.c
+++ b/drivers/gpu/drm/imx/ipuv3/parallel-display.c
@@ -350,7 +350,15 @@ static int imx_pd_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, imxpd);
 
-	return component_add(dev, &imx_pd_ops);
+	ret = component_add(dev, &imx_pd_ops);
+	if (ret)
+		goto free_edid;
+
+	return 0;
+
+free_edid:
+	drm_edid_free(imxpd->drm_edid);
+	return ret;
 }
 
 static void imx_pd_remove(struct platform_device *pdev)
-- 
2.46.0
Re: [PATCH] drm/ipuv3/parallel: Fix an error handling path in imx_pd_probe()
Posted by Jani Nikula 2 months, 3 weeks ago
On Fri, 06 Sep 2024, Christophe JAILLET <christophe.jaillet@wanadoo.fr> wrote:
> If component_add() fails, we need to undo a potential previous
> drm_edid_alloc() call.
>
> Add an error handling path and the missing drm_edid_free(), as already done
> in the reomve function.

See commit fe30fabf229f ("drm/imx: parallel-display: drop edid override
support").

BR,
Jani.


>
> Fixes: 42e08287a318 ("drm/ipuv3/parallel: convert to struct drm_edid")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
>  drivers/gpu/drm/imx/ipuv3/parallel-display.c | 10 +++++++++-
>  1 file changed, 9 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/imx/ipuv3/parallel-display.c b/drivers/gpu/drm/imx/ipuv3/parallel-display.c
> index 91d7808a2d8d..6d51203f7f0f 100644
> --- a/drivers/gpu/drm/imx/ipuv3/parallel-display.c
> +++ b/drivers/gpu/drm/imx/ipuv3/parallel-display.c
> @@ -350,7 +350,15 @@ static int imx_pd_probe(struct platform_device *pdev)
>  
>  	platform_set_drvdata(pdev, imxpd);
>  
> -	return component_add(dev, &imx_pd_ops);
> +	ret = component_add(dev, &imx_pd_ops);
> +	if (ret)
> +		goto free_edid;
> +
> +	return 0;
> +
> +free_edid:
> +	drm_edid_free(imxpd->drm_edid);
> +	return ret;
>  }
>  
>  static void imx_pd_remove(struct platform_device *pdev)

-- 
Jani Nikula, Intel