[PATCH 1/3] drm/exynos: free DP if probe fails to find a panel or bridge

[Inki Dae]

2014-11-21 8:54 GMT+09:00 Gustavo Padovan <gustavo at padovan.org>:
> From: Gustavo Padovan <gustavo.padovan at collabora.co.uk>
>
> DP was leaked everytime function returns EPROBE_DEFER, free it before
> returning.

It seems that you misunderstood devm_* api.

Thanks,
Inki Dae

>
> Signed-off-by: Gustavo Padovan <gustavo.padovan at collabora.co.uk>
> ---
>  drivers/gpu/drm/exynos/exynos_dp_core.c | 21 +++++++++++++++------
>  1 file changed, 15 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/exynos/exynos_dp_core.c b/drivers/gpu/drm/exynos/exynos_dp_core.c
> index 85762cf..6fd4a46 100644
> --- a/drivers/gpu/drm/exynos/exynos_dp_core.c
> +++ b/drivers/gpu/drm/exynos/exynos_dp_core.c
> @@ -1336,8 +1336,10 @@ static int exynos_dp_probe(struct platform_device *pdev)
>         if (panel_node) {
>                 dp->panel = of_drm_find_panel(panel_node);
>                 of_node_put(panel_node);
> -               if (!dp->panel)
> -                       return -EPROBE_DEFER;
> +               if (!dp->panel) {
> +                       ret = -EPROBE_DEFER;
> +                       goto free_dp;
> +               }
>         }
>
>         endpoint = of_graph_get_next_endpoint(dev->of_node, NULL);
> @@ -1346,10 +1348,14 @@ static int exynos_dp_probe(struct platform_device *pdev)
>                 if (bridge_node) {
>                         dp->bridge = of_drm_find_bridge(bridge_node);
>                         of_node_put(bridge_node);
> -                       if (!dp->bridge)
> -                               return -EPROBE_DEFER;
> -               } else
> -                       return -EPROBE_DEFER;
> +                       if (!dp->bridge) {
> +                               ret = -EPROBE_DEFER;
> +                               goto free_dp;
> +                       }
> +               } else {
> +                       ret = -EPROBE_DEFER;
> +                       goto free_dp;
> +               }
>         }
>
>         exynos_dp_display.ctx = dp;
> @@ -1359,6 +1365,9 @@ static int exynos_dp_probe(struct platform_device *pdev)
>                 exynos_drm_component_del(&pdev->dev,
>                                                 EXYNOS_DEVICE_TYPE_CONNECTOR);
>
> +free_dp:
> +       devm_kfree(dev, dp);
> +
>         return ret;
>  }
>
> --
> 1.9.3
>
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel