On Thu, Feb 27, 2020 at 07:14:37PM +0100, Daniel Vetter wrote:
> With this we can drop the final kfree from the release function.
> 
> v2: We need drm_dev_put to unroll the driver creation (once
> drm_dev_init and drmm_add_final_kfree suceeded), otherwise
> the drmm_ magic doesn't happen.
> 
> v3: Actually squash in the fixup (Laurent).
> 
> Signed-off-by: Daniel Vetter <[email protected]>
> Cc: Laurent Pinchart <[email protected]>
> Cc: Dave Airlie <[email protected]>
> Cc: Sean Paul <[email protected]>
> Cc: Thomas Zimmermann <[email protected]>
> Cc: Emil Velikov <[email protected]>
> Cc: Daniel Vetter <[email protected]>
> Cc: "Noralf Trønnes" <[email protected]>
> Cc: Thomas Gleixner <[email protected]>
> Cc: Sam Ravnborg <[email protected]>
> ---

Acked-by: Sam Ravnborg <[email protected]>
>  drivers/gpu/drm/udl/udl_drv.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/udl/udl_drv.c b/drivers/gpu/drm/udl/udl_drv.c
> index e6c1cd77d4d4..6a5594946096 100644
> --- a/drivers/gpu/drm/udl/udl_drv.c
> +++ b/drivers/gpu/drm/udl/udl_drv.c
> @@ -10,6 +10,7 @@
>  #include <drm/drm_fb_helper.h>
>  #include <drm/drm_file.h>
>  #include <drm/drm_gem_shmem_helper.h>
> +#include <drm/drm_managed.h>
>  #include <drm/drm_ioctl.h>
>  #include <drm/drm_probe_helper.h>
>  #include <drm/drm_print.h>
> @@ -38,7 +39,6 @@ static void udl_driver_release(struct drm_device *dev)
>       udl_fini(dev);
>       udl_modeset_cleanup(dev);
>       drm_dev_fini(dev);
> -     kfree(dev);
>  }
>  
>  static struct drm_driver driver = {
> @@ -77,11 +77,11 @@ static struct udl_device *udl_driver_create(struct 
> usb_interface *interface)
>  
>       udl->udev = udev;
>       udl->drm.dev_private = udl;
> +     drmm_add_final_kfree(&udl->drm, udl);
>  
>       r = udl_init(udl);
>       if (r) {
> -             drm_dev_fini(&udl->drm);
> -             kfree(udl);
> +             drm_dev_put(&udl->drm);
>               return ERR_PTR(r);
>       }
>  
> -- 
> 2.24.1
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Reply via email to