From 1a2ddb6da79ca582eeb682ec5909a71fcbab77fd Mon Sep 17 00:00:00 2001
From: Jean Delvare <khali@linux-fr.org>
Date: Sat, 9 Oct 2010 12:36:45 +0000
Subject: [PATCH] --- yaml --- r: 218275 b: refs/heads/master c:
 965d38074e6eae71757a8baf9a348139e1e6894d h: refs/heads/master i:   218273:
 334c10e0fa73574c7d871dc4fd7d8494de34b5b9   218271:
 b12d92a3b82c0e95e0eda78a3b9420e3ef537a82 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/gpu/drm/ttm/ttm_bo.c | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index f5f889c69ea8..f6439cd0577d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5480f727dc4c049eb46b191bfaeb034067aa6835
+refs/heads/master: 965d38074e6eae71757a8baf9a348139e1e6894d
diff --git a/trunk/drivers/gpu/drm/ttm/ttm_bo.c b/trunk/drivers/gpu/drm/ttm/ttm_bo.c
index 5ef0103bd0b6..9f2eed520fc3 100644
--- a/trunk/drivers/gpu/drm/ttm/ttm_bo.c
+++ b/trunk/drivers/gpu/drm/ttm/ttm_bo.c
@@ -166,18 +166,13 @@ static void ttm_bo_release_list(struct kref *list_kref)
 
 int ttm_bo_wait_unreserved(struct ttm_buffer_object *bo, bool interruptible)
 {
-
 	if (interruptible) {
-		int ret = 0;
-
-		ret = wait_event_interruptible(bo->event_queue,
+		return wait_event_interruptible(bo->event_queue,
 					       atomic_read(&bo->reserved) == 0);
-		if (unlikely(ret != 0))
-			return ret;
 	} else {
 		wait_event(bo->event_queue, atomic_read(&bo->reserved) == 0);
+		return 0;
 	}
-	return 0;
 }
 EXPORT_SYMBOL(ttm_bo_wait_unreserved);