From: Erik Gilling <konk...@android.com>

The previous fix only addressed waiting with a timeout.

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>
Signed-off-by: John Stultz <john.stu...@linaro.org>
---
 drivers/staging/android/sync.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c
index 889ca6e..811cf65 100644
--- a/drivers/staging/android/sync.c
+++ b/drivers/staging/android/sync.c
@@ -588,7 +588,8 @@ int sync_fence_wait(struct sync_fence *fence, long timeout)
                                                       sync_fence_check(fence),
                                                       timeout);
        } else if (timeout < 0) {
-               err = wait_event_interruptible(fence->wq, fence->status != 0);
+               err = wait_event_interruptible(fence->wq,
+                                              sync_fence_check(fence));
        }
 
        if (err < 0)
-- 
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/

Reply via email to