---

yaml --- r: 345358 b: refs/heads/master c: ae8df2a h: refs/heads/master v: v3
git-mirror · Nov 28, 2012 · cda239c · cda239c
1 parent f25f468
commit cda239c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35f62a582947ab151c013eaa8cf339e00a5941ab
+refs/heads/master: ae8df2ae8aa27bfeb8d1b99e8adaac5810a97fa8
diff --git a/trunk/drivers/gpu/drm/ttm/ttm_object.c b/trunk/drivers/gpu/drm/ttm/ttm_object.c
@@ -174,7 +174,9 @@ int ttm_base_object_init(struct ttm_object_file *tfile,
 
 	return 0;
 out_err1:
+	spin_lock(&tdev->object_lock);
 	(void)drm_ht_remove_item(&tdev->object_hash, &base->hash);
+	spin_unlock(&tdev->object_lock);
 out_err0:
 	return ret;
 }