From: Erik Gilling <konk...@android.com>
The previous fix only addressed waiting with a timeout.
Cc: Maarten Lankhorst <maarten.lankhorst at canonical.com>
Cc: Erik Gilling <konkers at android.com>
Cc: Daniel Vetter <daniel.vetter at ffwll.ch>
Cc: Rob Clark <robclark at gmail.com>
Cc: Sumit Semwal <sumit.semwal at linaro.org>
Cc: Greg KH <gregkh at linuxfoundation.org>
Cc: dri-devel at lists.freedesktop.org
Cc: Android Kernel Team <kernel-team at android.com>
Signed-off-by: Erik Gilling <konkers at android.com>
Signed-off-by: John Stultz <john.stultz at 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
