diff options
| author | Erik Gilling <konkers@android.com> | 2012-08-21 17:57:19 -0700 |
|---|---|---|
| committer | Varun Wadekar <vwadekar@nvidia.com> | 2012-09-18 13:55:09 +0530 |
| commit | 079d692d80f55c9fcb77bff98938691dd8cc77a7 (patch) | |
| tree | d8ea7a78887c08dea9da9c8f4667e86cd0ac52f6 /drivers/base | |
| parent | 87143662ef2cd5a2dd8dfc76380463fb9e80e5a5 (diff) | |
sync: change wait timeout to mirror poll semantics
Change-Id: Ib38e6d339d41885a33027752690d65a52b6897f6
Signed-off-by: Erik Gilling <konkers@android.com>
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/sync.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/base/sync.c b/drivers/base/sync.c index eee2e56cdaf5..fcf86326400a 100644 --- a/drivers/base/sync.c +++ b/drivers/base/sync.c @@ -560,14 +560,14 @@ EXPORT_SYMBOL(sync_fence_cancel_async); int sync_fence_wait(struct sync_fence *fence, long timeout) { - int err; + int err = 0; - if (timeout) { + if (timeout > 0) { timeout = msecs_to_jiffies(timeout); err = wait_event_interruptible_timeout(fence->wq, fence->status != 0, timeout); - } else { + } else if (timeout < 0{ err = wait_event_interruptible(fence->wq, fence->status != 0); } |