From: Erik Gilling <konk...@android.com> If the timeout is zero, don't trip the timeout debugging
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] Signed-off-by: John Stultz <john.stu...@linaro.org> --- drivers/staging/android/sync.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c index bd18c75..9b8b0e9 100644 --- a/drivers/staging/android/sync.c +++ b/drivers/staging/android/sync.c @@ -616,7 +616,7 @@ int sync_fence_wait(struct sync_fence *fence, long timeout) return fence->status; } - if (fence->status == 0) { + if (fence->status == 0 && timeout > 0) { pr_info("fence timeout on [%p] after %dms\n", fence, jiffies_to_msecs(timeout)); sync_dump(); -- 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/