From 0cbbaba5b0dee53145684e680868b11f712e10a3 Mon Sep 17 00:00:00 2001
From: Erik Gilling <konkers@android.com>
Date: Thu, 28 Feb 2013 16:43:20 -0800
Subject: [PATCH] --- yaml --- r: 363280 b: refs/heads/master c:
 4b5de08a37e8189c039424c92ca76ff605cf1c7f h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/staging/android/sync.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8cbad7b1d919..27d21ba226cf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eeb2f571639feedcfce3f1718b0c3fd85d796812
+refs/heads/master: 4b5de08a37e8189c039424c92ca76ff605cf1c7f
diff --git a/trunk/drivers/staging/android/sync.c b/trunk/drivers/staging/android/sync.c
index 889ca6eb9d42..811cf65eb3eb 100644
--- a/trunk/drivers/staging/android/sync.c
+++ b/trunk/drivers/staging/android/sync.c
@@ -588,7 +588,8 @@ int sync_fence_wait(struct sync_fence *fence, long timeout)
 						       sync_fence_check(fence),
 						       timeout);
 	} else if (timeout < 0) {
-		err = wait_event_interruptible(fence->wq, fence->status != 0);
+		err = wait_event_interruptible(fence->wq,
+					       sync_fence_check(fence));
 	}
 
 	if (err < 0)