From ed87f2b8b85d08f321678a29b09ac415fa4e6b7e Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thellstrom@vmware.com>
Date: Tue, 12 Jun 2012 13:28:42 +0200
Subject: [PATCH] --- yaml --- r: 310671 b: refs/heads/master c:
 a393c730ab69617c3291a3b0b2a228c9be2fc28c h: refs/heads/master i:   310669:
 38fd70bac6fa6c3630951dc463734370992b086c   310667:
 d06f3956dec86bb6baeda78f8ae47fc1d582e848   310663:
 a516a149a42667ee3ac8711a6fcf01ae3bc066e6   310655:
 7d3a195024652bf2f6e3c2e35a860efd912f8be3 v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/gpu/drm/ttm/ttm_bo.c | 13 +++----------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 87a39d110825..f38c2b65e6dd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe4561680519019cc15d660862dce513ded2f3a7
+refs/heads/master: a393c730ab69617c3291a3b0b2a228c9be2fc28c
diff --git a/trunk/drivers/gpu/drm/ttm/ttm_bo.c b/trunk/drivers/gpu/drm/ttm/ttm_bo.c
index b67cfcaa661f..36f4b28c1b90 100644
--- a/trunk/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/trunk/drivers/gpu/drm/ttm/ttm_bo.c
@@ -1204,6 +1204,7 @@ int ttm_bo_init(struct ttm_bo_device *bdev,
 			(*destroy)(bo);
 		else
 			kfree(bo);
+		ttm_mem_global_free(mem_glob, acc_size);
 		return -EINVAL;
 	}
 	bo->destroy = destroy;
@@ -1307,22 +1308,14 @@ int ttm_bo_create(struct ttm_bo_device *bdev,
 			struct ttm_buffer_object **p_bo)
 {
 	struct ttm_buffer_object *bo;
-	struct ttm_mem_global *mem_glob = bdev->glob->mem_glob;
 	size_t acc_size;
 	int ret;
 
-	acc_size = ttm_bo_acc_size(bdev, size, sizeof(struct ttm_buffer_object));
-	ret = ttm_mem_global_alloc(mem_glob, acc_size, false, false);
-	if (unlikely(ret != 0))
-		return ret;
-
 	bo = kzalloc(sizeof(*bo), GFP_KERNEL);
-
-	if (unlikely(bo == NULL)) {
-		ttm_mem_global_free(mem_glob, acc_size);
+	if (unlikely(bo == NULL))
 		return -ENOMEM;
-	}
 
+	acc_size = ttm_bo_acc_size(bdev, size, sizeof(struct ttm_buffer_object));
 	ret = ttm_bo_init(bdev, bo, size, type, placement, page_alignment,
 				buffer_start, interruptible,
 			  persistent_swap_storage, acc_size, NULL, NULL);