---

yaml --- r: 363279 b: refs/heads/master c: eeb2f57 h: refs/heads/master i: 363277: 13cf1ec 363275: e961e19 363271: 60e7405 363263: 2f0623b v: v3
git-mirror · Mar 4, 2013 · d0bc413 · d0bc413
1 parent 5024ff4
commit d0bc413
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git 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
@@ -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: