Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 363280
b: refs/heads/master
c: 4b5de08
h: refs/heads/master
v: v3
  • Loading branch information
Erik Gilling authored and Greg Kroah-Hartman committed Mar 4, 2013
1 parent d0bc413 commit 0cbbaba
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: eeb2f571639feedcfce3f1718b0c3fd85d796812
refs/heads/master: 4b5de08a37e8189c039424c92ca76ff605cf1c7f
3 changes: 2 additions & 1 deletion trunk/drivers/staging/android/sync.c
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,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)
Expand Down

0 comments on commit 0cbbaba

Please sign in to comment.