---

yaml --- r: 363285 b: refs/heads/master c: 4c67d80 h: refs/heads/master i: 363283: 6fb8cc6 v: v3
git-mirror · Mar 4, 2013 · 9879f71 · 9879f71
1 parent a2af804
commit 9879f71
Show file tree

Hide file tree

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