[PATCH 2/4] drm/omap: fix uninit order in pdev_remove()

Rob Clark robdclark at gmail.com
Wed Apr 2 07:16:49 PDT 2014


On Wed, Apr 2, 2014 at 8:37 AM, Tomi Valkeinen <tomi.valkeinen at ti.com> wrote:
> When unloading omapdrm driver, the omapdrm platform device is
> uninitialized last, after the displays have been disconnected omap_crtc
> callbacks have been removed. As the omapdrm pdev uninitialization needs
> the features uninitialized in earlier steps, a crash is guaranteed.
>
> This patch fixes the uninitialize order so that the omapdrm pdev is
> removed first.
>
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen at ti.com>

Reviewed-by: Rob Clark <robdclark at gmail.com

> ---
>  drivers/gpu/drm/omapdrm/omap_drv.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c
> index bf39fcc49e0f..df3e66416a30 100644
> --- a/drivers/gpu/drm/omapdrm/omap_drv.c
> +++ b/drivers/gpu/drm/omapdrm/omap_drv.c
> @@ -696,10 +696,11 @@ static int pdev_remove(struct platform_device *device)
>  {
>         DBG("");
>
> +       drm_put_dev(platform_get_drvdata(device));
> +
>         omap_disconnect_dssdevs();
>         omap_crtc_pre_uninit();
>
> -       drm_put_dev(platform_get_drvdata(device));
>         return 0;
>  }
>
> --
> 1.8.3.2
>


More information about the dri-devel mailing list