Commit 4a324d33 authored by David Herrmann's avatar David Herrmann Committed by Daniel Vetter

drm: simplify master cleanup

In drm_master_destroy() we _free_ the master object. There is no reason to
hold any locks while dropping its static members, nor do we have to reset
it to 0.

Furthermore, kfree() already does NULL checks, so call it directly on
master->unique and drop the redundant reset-code.
Signed-off-by: default avatarDavid Herrmann <dh.herrmann@gmail.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 32e7b94a
...@@ -132,15 +132,10 @@ static void drm_master_destroy(struct kref *kref) ...@@ -132,15 +132,10 @@ static void drm_master_destroy(struct kref *kref)
r_list = NULL; r_list = NULL;
} }
} }
if (master->unique) {
kfree(master->unique);
master->unique = NULL;
master->unique_len = 0;
}
mutex_unlock(&dev->struct_mutex); mutex_unlock(&dev->struct_mutex);
idr_destroy(&master->magic_map); idr_destroy(&master->magic_map);
kfree(master->unique);
kfree(master); kfree(master);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment