From 0195c739c81d98250cd8631b3b1fea09248a7cc7 Mon Sep 17 00:00:00 2001
From: Erik Gilling <konkers@android.com>
Date: Thu, 28 Feb 2013 16:43:14 -0800
Subject: [PATCH] --- yaml --- r: 363274 b: refs/heads/master c:
 3b640f5dd050f972439e5c67ba618a5377b61d34 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 26f040cc38be..7c0f1f2ed7e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 03e7a503561f6d0ef09c7ec73772a7a6f78417d3
+refs/heads/master: 3b640f5dd050f972439e5c67ba618a5377b61d34
diff --git a/trunk/drivers/staging/android/sync.c b/trunk/drivers/staging/android/sync.c
index c4a3c1d7946c..7fccfcdd9772 100644
--- a/trunk/drivers/staging/android/sync.c
+++ b/trunk/drivers/staging/android/sync.c
@@ -557,14 +557,14 @@ EXPORT_SYMBOL(sync_fence_cancel_async);
 
 int sync_fence_wait(struct sync_fence *fence, long timeout)
 {
-	int err;
+	int err = 0;
 
-	if (timeout) {
+	if (timeout > 0) {
 		timeout = msecs_to_jiffies(timeout);
 		err = wait_event_interruptible_timeout(fence->wq,
 						       fence->status != 0,
 						       timeout);
-	} else {
+	} else if (timeout < 0) {
 		err = wait_event_interruptible(fence->wq, fence->status != 0);
 	}
 
diff --git a/trunk/drivers/staging/android/sync.h b/trunk/drivers/staging/android/sync.h
index 15863a6ebe51..75ed5f1b75da 100644
--- a/trunk/drivers/staging/android/sync.h
+++ b/trunk/drivers/staging/android/sync.h
@@ -329,8 +329,8 @@ int sync_fence_cancel_async(struct sync_fence *fence,
  * @fence:	fence to wait on
  * @tiemout:	timeout in ms
  *
- * Wait for @fence to be signaled or have an error.  Waits indefintly
- * if @timeout = 0
+ * Wait for @fence to be signaled or have an error.  Waits indefinitely
+ * if @timeout < 0
  */
 int sync_fence_wait(struct sync_fence *fence, long timeout);
 
@@ -389,9 +389,9 @@ struct sync_fence_info_data {
 /**
  * DOC: SYNC_IOC_WAIT - wait for a fence to signal
  *
- * pass timeout in milliseconds.
+ * pass timeout in milliseconds.  Waits indefinitely timeout < 0.
  */
-#define SYNC_IOC_WAIT		_IOW(SYNC_IOC_MAGIC, 0, __u32)
+#define SYNC_IOC_WAIT		_IOW(SYNC_IOC_MAGIC, 0, __s32)
 
 /**
  * DOC: SYNC_IOC_MERGE - merge two fences