From 6ca05add40fc830fdcbc8bcfa693fe000662d1b3 Mon Sep 17 00:00:00 2001
From: Thomas Hellstrom <thellstrom@vmware.com>
Date: Mon, 3 Aug 2009 12:39:06 +0200
Subject: [PATCH] --- yaml --- r: 156285 b: refs/heads/master c:
 fee280d3fd9bc5247bef9f4ab35a4693bfffdcfd h: refs/heads/master i:   156283:
 2e5e4a54f392383aaa0b5355c12df5031ab689c1 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/gpu/drm/ttm/ttm_bo.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f9bdf353b584..bdd58f0504fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9b7fb54f0a51e587fa09be3a85666b43d36a850
+refs/heads/master: fee280d3fd9bc5247bef9f4ab35a4693bfffdcfd
diff --git a/trunk/drivers/gpu/drm/ttm/ttm_bo.c b/trunk/drivers/gpu/drm/ttm/ttm_bo.c
index 6538d4236989..aa82d5370c38 100644
--- a/trunk/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/trunk/drivers/gpu/drm/ttm/ttm_bo.c
@@ -1575,6 +1575,10 @@ int ttm_bo_wait(struct ttm_buffer_object *bo,
 			driver->sync_obj_unref(&sync_obj);
 			driver->sync_obj_unref(&tmp_obj);
 			spin_lock(&bo->lock);
+		} else {
+			spin_unlock(&bo->lock);
+			driver->sync_obj_unref(&sync_obj);
+			spin_lock(&bo->lock);
 		}
 	}
 	return 0;