---

yaml --- r: 363286 b: refs/heads/master c: 573632c h: refs/heads/master v: v3
git-mirror · Mar 4, 2013 · 81928bc · 81928bc
1 parent 9879f71
commit 81928bc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c67d802119813f11fd7c71ca9e6d0f805ea414a
+refs/heads/master: 573632c2eaf87429a89490173f34682bb71f6883
diff --git a/trunk/drivers/staging/android/sync.c b/trunk/drivers/staging/android/sync.c
@@ -616,10 +616,12 @@ int sync_fence_wait(struct sync_fence *fence, long timeout)
 		return fence->status;
 	}
 
-	if (fence->status == 0 && timeout > 0) {
-		pr_info("fence timeout on [%p] after %dms\n", fence,
-			jiffies_to_msecs(timeout));
-		sync_dump();
+	if (fence->status == 0) {
+		if (timeout > 0) {
+			pr_info("fence timeout on [%p] after %dms\n", fence,
+				jiffies_to_msecs(timeout));
+			sync_dump();
+		}
 		return -ETIME;
 	}