diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-14 19:33:47 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-14 19:33:47 -0700 |
| commit | caf382fe31b7327a1e4449f1c05c0cc7fb5b90be (patch) | |
| tree | b7b0fcbf594db884a68cbc354ed933b5c8ad6d61 /drivers/staging/android | |
| parent | ea521dbc48c1550a4302c851a1e77f5b84ac8f81 (diff) | |
| parent | 9e82bf014195d6f0054982c463575cdce24292be (diff) | |
| download | lwn-caf382fe31b7327a1e4449f1c05c0cc7fb5b90be.tar.gz lwn-caf382fe31b7327a1e4449f1c05c0cc7fb5b90be.zip | |
Merge 3.17-rc5 into staging-next.
This fixes a merge conflict in lustre, and we want the other fixes that
went into 3.17-rc5 as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/android')
| -rw-r--r-- | drivers/staging/android/sync.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c index c5255dc50691..7bdb62bf6b40 100644 --- a/drivers/staging/android/sync.c +++ b/drivers/staging/android/sync.c @@ -199,7 +199,6 @@ struct sync_fence *sync_fence_create(const char *name, struct sync_pt *pt) fence->num_fences = 1; atomic_set(&fence->status, 1); - fence_get(&pt->base); fence->cbs[0].sync_pt = &pt->base; fence->cbs[0].fence = fence; if (fence_add_callback(&pt->base, &fence->cbs[0].cb, |