Skip to content

Commit

Permalink
staging: sync: Fix timeout = 0 wait behavior
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jamie Gennis authored and Greg Kroah-Hartman committed Mar 4, 2013
1 parent 4c67d80 commit 573632c
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions drivers/staging/android/sync.c
Original file line number Diff line number Diff line change
Expand Up @@ -616,10 +616,12 @@ int sync_fence_wait(struct sync_fence *fence, long timeout)
return fence->status;
}

if (fence->status == 0 && timeout > 0) {
pr_info("fence timeout on [%p] after %dms\n", fence,
jiffies_to_msecs(timeout));
sync_dump();
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;
}

Expand Down

0 comments on commit 573632c

Please sign in to comment.