summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2019-01-31 17:42:11 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2019-01-31 17:42:10 -0800
commit36a07fa583e2fd5f00af6b63e37395fa4419518b (patch)
tree13a65abb0d00482f4317f79c33717e4ce12de026
parent9fbd68e8f4d949a8b9f62f931a8a8cff68df7432 (diff)
parent6693b0baa7d29c1de4f3b30cb0b75ee144230923 (diff)
Merge "staging: android/sync: Signal fences if timeline is destroyed"
-rw-r--r--drivers/staging/android/sync.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c
index 5238d67490ce..39b99740a6d8 100644
--- a/drivers/staging/android/sync.c
+++ b/drivers/staging/android/sync.c
@@ -451,6 +451,8 @@ static bool android_fence_signaled(struct fence *fence)
int ret;
ret = parent->ops->has_signaled(pt);
+ if (!ret && parent->destroyed)
+ ret = -ENOENT;
if (ret < 0)
fence->status = ret;
return ret;