]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
drm: Add missing mutex_destroy in drm_dev_init/release
authorJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Thu, 10 Nov 2016 13:50:35 +0000 (15:50 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 11 Nov 2016 13:10:03 +0000 (14:10 +0100)
Add 3 missing mutex_destroy to drm_dev_init teardown and
drm_dev_release.

v2:
- Also include drm_dev_release

Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1478785835-4142-1-git-send-email-joonas.lahtinen@linux.intel.com
Link: http://patchwork.freedesktop.org/patch/msgid/1478785835-4142-1-git-send-email-joonas.lahtinen@linux.intel.com
drivers/gpu/drm/drm_drv.c

index 6efdba4993fc8c5f1a0f15c0de163bd89d1eaccc..d1cb73963169ada866334de0273898730583e7cd 100644 (file)
@@ -568,6 +568,9 @@ err_minors:
        drm_fs_inode_free(dev->anon_inode);
 err_free:
        mutex_destroy(&dev->master_mutex);
+       mutex_destroy(&dev->ctxlist_mutex);
+       mutex_destroy(&dev->filelist_mutex);
+       mutex_destroy(&dev->struct_mutex);
        return ret;
 }
 EXPORT_SYMBOL(drm_dev_init);
@@ -630,6 +633,9 @@ static void drm_dev_release(struct kref *ref)
        drm_minor_free(dev, DRM_MINOR_CONTROL);
 
        mutex_destroy(&dev->master_mutex);
+       mutex_destroy(&dev->ctxlist_mutex);
+       mutex_destroy(&dev->filelist_mutex);
+       mutex_destroy(&dev->struct_mutex);
        kfree(dev->unique);
        kfree(dev);
 }