From 73d909b7251be90738dd12080b9dfe5bc5c9fb3f Mon Sep 17 00:00:00 2001 From: Kent Russell Date: Wed, 22 Feb 2017 09:17:19 -0500 Subject: [PATCH 0835/4131] drm/amdgpu: Fix FD leak due to rebase conflict This was missed during the rebase conflict resolution Change-Id: I6e9b623a109a46cde8e7ddf84a547af7f1b75d9c Signed-off-by: Kent Russell --- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c index 69b2f39..8d186d2 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c @@ -367,11 +367,6 @@ int amdgpu_bo_create_restricted(struct amdgpu_device *adev, return -ENOMEM; } - r = drm_gem_object_init(adev->ddev, &gobj->base, size); - if (unlikely(r)) { - kfree(bo); - return r; - } INIT_LIST_HEAD(&bo->shadow_list); INIT_LIST_HEAD(&bo->va); INIT_LIST_HEAD(&bo->gem_objects); -- 2.7.4