From d0bc413474e4d50d4467e427349d8f20701f750f Mon Sep 17 00:00:00 2001
From: Erik Gilling <konkers@android.com>
Date: Thu, 28 Feb 2013 16:43:19 -0800
Subject: [PATCH] --- yaml --- r: 363279 b: refs/heads/master c:
 eeb2f571639feedcfce3f1718b0c3fd85d796812 h: refs/heads/master i:   363277:
 13cf1ec701a243d5b5992e267b4aa5e3feec5b73   363275:
 e961e19307afb5269e8dba389d7c7913b71ca8d1   363271:
 60e7405887a1f42330bc933c05efed1218634b35   363263:
 2f0623bfd634689796c5805bf52e44e367ea5b0e v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/staging/android/sync.c | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1e619e05aa8c..8cbad7b1d919 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c679212dbfd060513e156133326122bf9f496579
+refs/heads/master: eeb2f571639feedcfce3f1718b0c3fd85d796812
diff --git a/trunk/drivers/staging/android/sync.c b/trunk/drivers/staging/android/sync.c
index 2394189c5958..889ca6eb9d42 100644
--- a/trunk/drivers/staging/android/sync.c
+++ b/trunk/drivers/staging/android/sync.c
@@ -295,6 +295,12 @@ struct sync_fence *sync_fence_create(const char *name, struct sync_pt *pt)
 	list_add(&pt->pt_list, &fence->pt_list_head);
 	sync_pt_activate(pt);
 
+	/*
+	 * signal the fence in case pt was activated before
+	 * sync_pt_activate(pt) was called
+	 */
+	sync_fence_signal_pt(pt);
+
 	return fence;
 }
 EXPORT_SYMBOL(sync_fence_create);
@@ -457,7 +463,13 @@ struct sync_fence *sync_fence_merge(const char *name,
 	if (err < 0)
 		goto err;
 
-	fence->status = sync_fence_get_status(fence);
+	/*
+	 * signal the fence in case one of it's pts were activated before
+	 * they were activated
+	 */
+	sync_fence_signal_pt(list_first_entry(&fence->pt_list_head,
+					      struct sync_pt,
+					      pt_list));
 
 	return fence;
 err: