2017-09-24 06:03:44

by Christophe JAILLET

Subject: [PATCH] drm/omap: Fix error handling path in 'omap_dmm_probe()'

If we don't find a matching device node, we must free the memory allocated
in 'omap_dmm' a few lines above.

Fixes: 7cb0d6c17b96 ("drm/omap: fix TILER on OMAP5")
Signed-off-by: Christophe JAILLET <[email protected]>
---
drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
index 1dd3dafc59af..c60a85e82c6d 100644
--- a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
+++ b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
@@ -638,7 +638,8 @@ static int omap_dmm_probe(struct platform_device *dev)
match = of_match_node(dmm_of_match, dev->dev.of_node);
if (!match) {
dev_err(&dev->dev, "failed to find matching device node\n");
- return -ENODEV;
+ ret = -ENODEV;
+ goto fail;
}

omap_dmm->plat_data = match->data;
--
2.11.0

2017-09-28 06:24:07

by Tomi Valkeinen

Subject: Re: [PATCH] drm/omap: Fix error handling path in 'omap_dmm_probe()'


Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

On 24/09/17 09:01, Christophe JAILLET wrote:
> If we don't find a matching device node, we must free the memory allocated
> in 'omap_dmm' a few lines above.
>
> Fixes: 7cb0d6c17b96 ("drm/omap: fix TILER on OMAP5")
> Signed-off-by: Christophe JAILLET <[email protected]>
> ---
> drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
> index 1dd3dafc59af..c60a85e82c6d 100644
> --- a/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
> +++ b/drivers/gpu/drm/omapdrm/omap_dmm_tiler.c
> @@ -638,7 +638,8 @@ static int omap_dmm_probe(struct platform_device *dev)
> match = of_match_node(dmm_of_match, dev->dev.of_node);
> if (!match) {
> dev_err(&dev->dev, "failed to find matching device node\n");
> - return -ENODEV;
> + ret = -ENODEV;
> + goto fail;
> }
>
> omap_dmm->plat_data = match->data;
>

Thanks! I have picked this up.

Tomi