From 9879f71136fcdda727891ad77f31ddd339dda253 Mon Sep 17 00:00:00 2001
From: Erik Gilling <konkers@android.com>
Date: Thu, 28 Feb 2013 16:43:25 -0800
Subject: [PATCH] --- yaml --- r: 363285 b: refs/heads/master c:
 4c67d802119813f11fd7c71ca9e6d0f805ea414a h: refs/heads/master i:   363283:
 6fb8cc68f0e1ab47052e6f003944b5c1802ed167 v: v3

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

diff --git a/[refs] b/[refs]
index 6dda405451b2..c4a78189f3b9 100644
--- 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
index bd18c755c779..9b8b0e96b988 100644
--- 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();