From 5a040b1e774b5f2316a4f6e25ffae711dc76cf0e Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Fri, 8 Oct 2010 14:34:49 +0200 Subject: [PATCH] --- yaml --- r: 211468 b: refs/heads/master c: a8c051f0c8d2f81c665e820f765aaddf86161640 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/radeon/radeon_object.h | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 6a90b51376c8..0aead0cc1f0c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d31dba58480c3cdd458f449261d72ecd15287792 +refs/heads/master: a8c051f0c8d2f81c665e820f765aaddf86161640 diff --git a/trunk/drivers/gpu/drm/radeon/radeon_object.h b/trunk/drivers/gpu/drm/radeon/radeon_object.h index 353998dc2c03..3481bc7f6f58 100644 --- a/trunk/drivers/gpu/drm/radeon/radeon_object.h +++ b/trunk/drivers/gpu/drm/radeon/radeon_object.h @@ -124,11 +124,8 @@ static inline int radeon_bo_wait(struct radeon_bo *bo, u32 *mem_type, int r; r = ttm_bo_reserve(&bo->tbo, true, no_wait, false, 0); - if (unlikely(r != 0)) { - if (r != -ERESTARTSYS) - dev_err(bo->rdev->dev, "%p reserve failed for wait\n", bo); + if (unlikely(r != 0)) return r; - } spin_lock(&bo->tbo.lock); if (mem_type) *mem_type = bo->tbo.mem.mem_type;