From: Erik Gilling <konkers@android.com>
Date: Tue, 16 Oct 2012 00:58:46 +0000 (-0700)
Subject: sync: use proper barriers when waiting indefinitely
X-Git-Tag: firefly_0821_release~7554
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8beeb5734620d640c4855e0addf898fb4354b86b;p=firefly-linux-kernel-4.4.55.git

sync: use proper barriers when waiting indefinitely

The previous fix only addressed waiting with a timeout.

Change-Id: I8ad735d2d0dfdd53592904e8a54f5689cb5eaa5e
Signed-off-by: Erik Gilling <konkers@android.com>
---

diff --git a/drivers/base/sync.c b/drivers/base/sync.c
index b35344da4529..811365789d5b 100644
--- a/drivers/base/sync.c
+++ b/drivers/base/sync.c
@@ -587,7 +587,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)