1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/dma-buf/dma-fence.c b/drivers/dma-buf/dma-fence.c
index 8025a891d3e9..ff0cd6eae766 100644
--- a/drivers/dma-buf/dma-fence.c
+++ b/drivers/dma-buf/dma-fence.c
@@ -149,9 +149,12 @@ int dma_fence_signal_locked(struct dma_fence *fence)
                 trace_dma_fence_signaled(fence);
         }
 
-        list_for_each_entry_safe(cur, tmp, &fence->cb_list, node) {
-                list_del_init(&cur->node);
-                cur->func(fence, cur);
+        if (!list_empty(&fence->cb_list)) {
+                list_for_each_entry_safe(cur, tmp, &fence->cb_list, node) {
+                        INIT_LIST_HEAD(&cur->node);
+                        cur->func(fence, cur);
+                }
+                INIT_LIST_HEAD(&fence->cb_list);
         }
         return ret;
 }