drm/i915: Update intel_logical_ring_begin() to take a request structure

[deliverable/linux.git] / drivers / gpu / drm / drm_drv.c

diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index 88b594c0593abcf464c4cf3d366385d7a37b58cc..3b3c4f537e957460aea5de8a60833949c709bd94 100644 (file)
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -132,15 +132,10 @@ static void drm_master_destroy(struct kref *kref)
                        r_list = NULL;
                }
        }
-
-       if (master->unique) {
-               kfree(master->unique);
-               master->unique = NULL;
-               master->unique_len = 0;
-       }
        mutex_unlock(&dev->struct_mutex);
 
        idr_destroy(&master->magic_map);
+       kfree(master->unique);
        kfree(master);
 }