summaryrefslogtreecommitdiffstats
path: root/drivers/staging/android
diff options
context:
space:
mode:
authorErik Gilling <konkers@android.com>2013-02-28 16:43:25 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-04 17:46:55 +0800
commit4c67d802119813f11fd7c71ca9e6d0f805ea414a (patch)
treec2aca0bcaa4961de21c97563f0228febf476087c /drivers/staging/android
parent713648f0f137e149a1acade3278b621728291f37 (diff)
downloadlinux-4c67d802119813f11fd7c71ca9e6d0f805ea414a.tar.bz2
staging: sync: Don't log wait timeouts when timeout = 0
If the timeout is zero, don't trip the timeout debugging 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: Erik Gilling <konkers@android.com> [jstultz: Added commit message] Signed-off-by: John Stultz <john.stultz@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/android')
-rw-r--r--drivers/staging/android/sync.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c
index bd18c755c779..9b8b0e96b988 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();