Merge branch 'drm-misc-next-fixes' into drm-misc-fixes

[mirror_ubuntu-artful-kernel.git] / drivers / dma-buf / dma-fence.c

diff --git a/drivers/dma-buf/dma-fence.c b/drivers/dma-buf/dma-fence.c
index 13556fdda2a52836b4ec38af48d54a48aa518bdd..56e0a0e1b6001e516447d1b7a513861951705a2c 100644 (file)
--- a/drivers/dma-buf/dma-fence.c
+++ b/drivers/dma-buf/dma-fence.c
@@ -397,6 +397,11 @@ dma_fence_default_wait(struct dma_fence *fence, bool intr, signed long timeout)
                }
        }
 
+       if (!timeout) {
+               ret = 0;
+               goto out;
+       }
+
        cb.base.func = dma_fence_default_wait_cb;
        cb.task = current;
        list_add(&cb.base.node, &fence->cb_list);