summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErik Gilling2012-08-21 20:21:18 -0500
committerErik Gilling2012-08-21 20:21:18 -0500
commit984d35703d5c6738253193bd53da9dedb3b58243 (patch)
tree0f1d442fab3c7bde6497e6aba2adacbfad487fe8
parent6302b420554724c1434e27e2cd46cb43f5fb7bca (diff)
downloadplatform-system-core-984d35703d5c6738253193bd53da9dedb3b58243.tar.gz
platform-system-core-984d35703d5c6738253193bd53da9dedb3b58243.tar.xz
platform-system-core-984d35703d5c6738253193bd53da9dedb3b58243.zip
update libsync to support new timeout semantics
Change-Id: Ibedbd261bb96a84785c4e679b6fc4061287d5d7d
-rw-r--r--include/sync/sync.h2
-rw-r--r--libsync/sync.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/include/sync/sync.h b/include/sync/sync.h
index f015fa165..918acf652 100644
--- a/include/sync/sync.h
+++ b/include/sync/sync.h
@@ -42,7 +42,7 @@ struct sync_pt_info {
42}; 42};
43 43
44/* timeout in msecs */ 44/* timeout in msecs */
45int sync_wait(int fd, unsigned int timeout); 45int sync_wait(int fd, int timeout);
46int sync_merge(const char *name, int fd1, int fd2); 46int sync_merge(const char *name, int fd1, int fd2);
47struct sync_fence_info_data *sync_fence_info(int fd); 47struct sync_fence_info_data *sync_fence_info(int fd);
48struct sync_pt_info *sync_pt_info(struct sync_fence_info_data *info, 48struct sync_pt_info *sync_pt_info(struct sync_fence_info_data *info,
diff --git a/libsync/sync.c b/libsync/sync.c
index c20f15edc..489286673 100644
--- a/libsync/sync.c
+++ b/libsync/sync.c
@@ -27,9 +27,9 @@
27#include <sys/stat.h> 27#include <sys/stat.h>
28#include <sys/types.h> 28#include <sys/types.h>
29 29
30int sync_wait(int fd, unsigned int timeout) 30int sync_wait(int fd, int timeout)
31{ 31{
32 __u32 to = timeout; 32 __s32 to = timeout;
33 33
34 return ioctl(fd, SYNC_IOC_WAIT, &to); 34 return ioctl(fd, SYNC_IOC_WAIT, &to);
35} 35}