diff options
| author | John Stultz <john.stultz@linaro.org> | 2013-11-04 14:46:43 -0800 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2013-11-04 14:46:43 -0800 |
| commit | b38c6f06915c69424abb85fbd5c16e418865ed9b (patch) | |
| tree | f486e22499fc5ce7548b76f299ecb91f52baf8ed /drivers/staging/android/sync.c | |
| parent | ce5c776ed5ed5c8619930387c5c10ec3f0d53047 (diff) | |
| parent | 4155e96bc418753a0c7a25d9ffb6d959d3933dc1 (diff) | |
Merge branch 'upstream/android-3.10' into linaro-fixes/android-3.10
Diffstat (limited to 'drivers/staging/android/sync.c')
| -rw-r--r-- | drivers/staging/android/sync.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c index c5a43934e85..d38305b4093 100644 --- a/drivers/staging/android/sync.c +++ b/drivers/staging/android/sync.c @@ -79,13 +79,13 @@ static void sync_timeline_free(struct kref *kref) container_of(kref, struct sync_timeline, kref); unsigned long flags; - if (obj->ops->release_obj) - obj->ops->release_obj(obj); - spin_lock_irqsave(&sync_timeline_list_lock, flags); list_del(&obj->sync_timeline_list); spin_unlock_irqrestore(&sync_timeline_list_lock, flags); + if (obj->ops->release_obj) + obj->ops->release_obj(obj); + kfree(obj); } |