diff options
| author | Christoph Muellner <christoph.muellner@theobroma-systems.com> | 2015-04-22 15:00:21 +0200 |
|---|---|---|
| committer | Klaus Goger <klaus.goger@theobroma-systems.com> | 2015-07-30 18:52:54 +0200 |
| commit | 16cc6e9ca2b00a96a226a5f3e6b839cfd10b1b97 (patch) | |
| tree | 846d42a18ee4e827365a5ec5768a98253cbc6e1e /drivers/staging/android/sw_sync.c | |
| parent | 3b585b21e63763cf2c32bba8195147d7f4688f6d (diff) | |
Revert "android: convert sync to fence api, v6"
This reverts commit 0f0d8406fb9c3c5ed1b1609a0f51c504c5b37aea.
Conflicts:
drivers/staging/android/Makefile
drivers/staging/android/sync.c
drivers/staging/android/sync_debug.c
Signed-off-by: Christoph Muellner <christoph.muellner@theobroma-systems.com>
Diffstat (limited to 'drivers/staging/android/sw_sync.c')
| -rw-r--r-- | drivers/staging/android/sw_sync.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/android/sw_sync.c b/drivers/staging/android/sw_sync.c index c90838d36953..faa5e239b184 100644 --- a/drivers/staging/android/sw_sync.c +++ b/drivers/staging/android/sw_sync.c @@ -50,7 +50,7 @@ static struct sync_pt *sw_sync_pt_dup(struct sync_pt *sync_pt) { struct sw_sync_pt *pt = (struct sw_sync_pt *)sync_pt; struct sw_sync_timeline *obj = - (struct sw_sync_timeline *)sync_pt_parent(sync_pt); + (struct sw_sync_timeline *)sync_pt->parent; return (struct sync_pt *)sw_sync_pt_create(obj, pt->value); } @@ -59,7 +59,7 @@ static int sw_sync_pt_has_signaled(struct sync_pt *sync_pt) { struct sw_sync_pt *pt = (struct sw_sync_pt *)sync_pt; struct sw_sync_timeline *obj = - (struct sw_sync_timeline *)sync_pt_parent(sync_pt); + (struct sw_sync_timeline *)sync_pt->parent; return sw_sync_cmp(obj->value, pt->value) >= 0; } |