X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=drivers%2Fdma-buf%2Freservation.c;h=39920d77f288d7802c054130acf72caa8f40465d;hb=af6b7a82fd2416d68bcf46d18d96de9b59e43b06;hp=3c97c8fa8d02687290e7340f82666f3466fbda2e;hpb=36d07e3ac7533d5029f74001a89d61eb18064421;p=cascardo%2Flinux.git

diff --git a/drivers/dma-buf/reservation.c b/drivers/dma-buf/reservation.c
index 3c97c8fa8d02..39920d77f288 100644
--- a/drivers/dma-buf/reservation.c
+++ b/drivers/dma-buf/reservation.c
@@ -327,6 +327,9 @@ long reservation_object_wait_timeout_rcu(struct reservation_object *obj,
 	unsigned seq, shared_count, i = 0;
 	long ret = timeout;
 
+	if (!timeout)
+		return reservation_object_test_signaled_rcu(obj, wait_all);
+
 retry:
 	fence = NULL;
 	shared_count = 0;
@@ -402,8 +405,6 @@ reservation_object_test_signaled_single(struct fence *passed_fence)
 	int ret = 1;
 
 	if (!test_bit(FENCE_FLAG_SIGNALED_BIT, &lfence->flags)) {
-		int ret;
-
 		fence = fence_get_rcu(lfence);
 		if (!fence)
 			return -1;