Commit 573632c2 authored Feb 28, 2013 by Jamie Gennis Committed by Greg Kroah-Hartman Mar 04, 2013

staging: sync: Fix timeout = 0 wait behavior



Fix wait behavior on timeout == 0 case

Cc: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Cc: Erik Gilling <konkers@android.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Rob Clark <robclark@gmail.com>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: dri-devel@lists.freedesktop.org
Cc: Android Kernel Team <kernel-team@android.com>
Signed-off-by: Jamie Gennis <jgennis@google.com>
[jstultz: Added commit message]
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 4c67d802

drivers/staging/android/sync.c

+6 −4

Original line number	Diff line number	Diff line
		@@ -616,10 +616,12 @@ int sync_fence_wait(struct sync_fence *fence, long timeout)
		return fence->status;
		}

		if (fence->status == 0 && timeout > 0) {
		if (fence->status == 0) {
		if (timeout > 0) {
		pr_info("fence timeout on [%p] after %dms\n", fence,
		jiffies_to_msecs(timeout));
		sync_dump();
		}
		return -ETIME;
		}