From cda239c3835fc2e6a9366a429c312ffdc344591f Mon Sep 17 00:00:00 2001 From: Thomas Hellstrom Date: Tue, 20 Nov 2012 12:16:50 +0000 Subject: [PATCH] --- yaml --- r: 345358 b: refs/heads/master c: ae8df2ae8aa27bfeb8d1b99e8adaac5810a97fa8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/ttm/ttm_object.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 5ca1d3ff7ebe..0a41f0d1e240 100644 --- 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 index f18eeb458139..0e13d9f059ff 100644 --- 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; }