From: Erik Gilling <konk...@android.com>
Change wait timeout to act like poll
Cc: Maarten Lankhorst <maarten.lankho...@canonical.com>
Cc: Erik Gilling <konk...@android.com>
Cc: Daniel Vetter <daniel.vet...@ffwll.ch>
Cc: Rob Clark <robcl...@gmail.com>
Cc: Sumit Semwal <sumit.sem...@linaro.org>
Cc: Greg KH <gre...@linuxfoundation.org>
Cc: dri-de...@lists.freedesktop.org
Cc: Android Kernel Team <kernel-t...@android.com>
Signed-off-by: Erik Gilling <konk...@android.com>
[jstultz: Added commit message, squished typo-fix]
Signed-off-by: John Stultz <john.stu...@linaro.org>
---
drivers/staging/android/sync.c | 6 +++---
drivers/staging/android/sync.h | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c
index c4a3c1d..7fccfcd 100644
--- a/drivers/staging/android/sync.c
+++ b/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/drivers/staging/android/sync.h b/drivers/staging/android/sync.h
index 15863a6..75ed5f1 100644
--- a/drivers/staging/android/sync.h
+++ b/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
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
