From 2f0623bfd634689796c5805bf52e44e367ea5b0e Mon Sep 17 00:00:00 2001
From: Erik Gilling <konkers@android.com>
Date: Thu, 28 Feb 2013 16:43:03 -0800
Subject: [PATCH] --- yaml --- r: 363263 b: refs/heads/master c:
 b1489c2704b3db72ff37ecabe054926176e88e50 h: refs/heads/master i:   363261:
 6ee69bb0a8e881452c0181ae2ef3f18246c84f38   363259:
 44041119b739ee4b229401007fdfb48fefa2a302   363255:
 6872bcac75c93f3e38f4aefe0f5bf6e618e28273   363247:
 f76142a8eef546c8e4623fb6930472466ea2458d   363231:
 818bae2780a6a3d12a4b434f1637ef807d84f294   363199:
 23963c9fc0683e1443c814173f0deeca6e5f8aa4   363135:
 184fdc8e5ea4b1130fdb1f4c892ee80454246d87   363007:
 3ef5e269911337fd58c0a31ed6a26df938149ec2 v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/staging/android/sw_sync.c | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c1410371d79e..555457a42857 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 79ba1525a91e99cdd7a3b6a57c7537d13ac0ac19
+refs/heads/master: b1489c2704b3db72ff37ecabe054926176e88e50
diff --git a/trunk/drivers/staging/android/sw_sync.c b/trunk/drivers/staging/android/sw_sync.c
index 64c5ebbbb1a0..081e4d188fe9 100644
--- a/trunk/drivers/staging/android/sw_sync.c
+++ b/trunk/drivers/staging/android/sw_sync.c
@@ -87,6 +87,19 @@ static void sw_sync_print_pt(struct seq_file *s, struct sync_pt *sync_pt)
 	seq_printf(s, "%d / %d", pt->value, obj->value);
 }
 
+static int sw_sync_fill_driver_data(struct sync_pt *sync_pt,
+				    void *data, int size)
+{
+	struct sw_sync_pt *pt = (struct sw_sync_pt *)sync_pt;
+
+	if (size < sizeof(pt->value))
+		return -ENOMEM;
+
+	memcpy(data, &pt->value, sizeof(pt->value));
+
+	return sizeof(pt->value);
+}
+
 struct sync_timeline_ops sw_sync_timeline_ops = {
 	.driver_name = "sw_sync",
 	.dup = sw_sync_pt_dup,
@@ -94,6 +107,7 @@ struct sync_timeline_ops sw_sync_timeline_ops = {
 	.compare = sw_sync_pt_compare,
 	.print_obj = sw_sync_print_obj,
 	.print_pt = sw_sync_print_pt,
+	.fill_driver_data = sw_sync_fill_driver_data,
 };