blob: 270bf02b283f21e5c8ded484414d1533e2ae3ebc (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
|
From 0f38b702244082fd58753b4e0f9dd3f7f11c05c3 Mon Sep 17 00:00:00 2001
From: Kent Russell <kent.russell@amd.com>
Date: Wed, 22 Feb 2017 09:17:19 -0500
Subject: [PATCH 1603/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 <kent.russell@amd.com>
---
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 cde1dad..6215299 100755
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@ -370,11 +370,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
|
