From 81928bccedb02e0e60233f89196bde3201db627c Mon Sep 17 00:00:00 2001
From: Jamie Gennis <jgennis@google.com>
Date: Thu, 28 Feb 2013 16:43:26 -0800
Subject: [PATCH] --- yaml --- r: 363286 b: refs/heads/master c:
 573632c2eaf87429a89490173f34682bb71f6883 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index c4a78189f3b9..bb77bf68f6d1 100644
--- 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
index 9b8b0e96b988..b9bb974faacd 100644
--- 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;
 	}