commit 1db0e0e5b7588ea56aee3538f3181d594c018b65
author Saurabh Shah <saurshah@quicinc.com> Tue Sep 26 18:00:05 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Sep 26 18:00:05 2017 +0000
tree a69da1136701a460ec25583ec1ff08989d831c89
parent 687cb99e96073cd3602a24a920747496c363fe98
parent 53a13e5705b4692c5e13b3ed8eb56931599e1fef

Merge "sync: store the num_fences from first SYNC_IOC_FILE_INFO" am: f7d14b643b
am: 53a13e5705

Change-Id: Iab1bb3b899965445087338ae01fbfb05c262027f

libsync/sync.c

diff --git a/libsync/sync.c b/libsync/sync.c
index e657658..6b187fa 100644
--- a/libsync/sync.c
+++ b/libsync/sync.c
@@ -217,6 +217,8 @@
                   local_info.num_fences * sizeof(struct sync_fence_info));
     if (!info)
         return NULL;
+
+    info->num_fences = local_info.num_fences;
     info->sync_fence_info = (__u64)(uintptr_t)(info + 1);
 
     err = ioctl(fd, SYNC_IOC_FILE_INFO, info);