aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo Padovan <gustavo.padovan@collabora.co.uk>2016-08-11 11:26:40 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-08-15 10:39:45 -0400
commita4ebee657c9be3afd35530cd4478b0fa514706d7 (patch)
treef3a1e7961a8270fa3d71c9947152821e8f72a4a7
parent04b8290f3b95a3935ed07f2954bad9c87e8fb143 (diff)
staging/android: do not let userspace trigger WARN_ON
Closing the timeline without waiting all fences to signal is not a critical failure, it is just bad usage from userspace so avoid calling WARN_ON in this case. Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/android/sw_sync.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/android/sw_sync.c b/drivers/staging/android/sw_sync.c
index 115c9174705f..bda1f6a220c1 100644
--- a/drivers/staging/android/sw_sync.c
+++ b/drivers/staging/android/sw_sync.c
@@ -176,7 +176,7 @@ static void timeline_fence_release(struct fence *fence)
176 176
177 spin_lock_irqsave(fence->lock, flags); 177 spin_lock_irqsave(fence->lock, flags);
178 list_del(&pt->child_list); 178 list_del(&pt->child_list);
179 if (WARN_ON_ONCE(!list_empty(&pt->active_list))) 179 if (!list_empty(&pt->active_list))
180 list_del(&pt->active_list); 180 list_del(&pt->active_list);
181 spin_unlock_irqrestore(fence->lock, flags); 181 spin_unlock_irqrestore(fence->lock, flags);
182 182