aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichel Dänzer <michel.daenzer@amd.com>2015-01-22 02:00:17 -0500
committerSumit Semwal <sumit.semwal@linaro.org>2015-01-22 05:59:31 -0500
commit4eb2440ed60fb5793f7aa6da89b3d517cc59de43 (patch)
tree006c9a11c5cc0e534bed38ea71c108ee3ef0d8fb
parent847b19a39e4c9b5e74c40f0842c48b41664cb43c (diff)
reservation: Remove shadowing local variable 'ret'
It was causing the return value of fence_is_signaled to be ignored, making reservation objects signal too early. Cc: stable@vger.kernel.org Reviewed-by: Maarten Lankhorst <maarten.lankhorst@canonical.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Michel Dänzer <michel.daenzer@amd.com> Signed-off-by: Sumit Semwal <sumit.semwal@linaro.org>
-rw-r--r--drivers/dma-buf/reservation.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/dma-buf/reservation.c b/drivers/dma-buf/reservation.c
index 807ef1555255..39920d77f288 100644
--- a/drivers/dma-buf/reservation.c
+++ b/drivers/dma-buf/reservation.c
@@ -405,8 +405,6 @@ reservation_object_test_signaled_single(struct fence *passed_fence)
405 int ret = 1; 405 int ret = 1;
406 406
407 if (!test_bit(FENCE_FLAG_SIGNALED_BIT, &lfence->flags)) { 407 if (!test_bit(FENCE_FLAG_SIGNALED_BIT, &lfence->flags)) {
408 int ret;
409
410 fence = fence_get_rcu(lfence); 408 fence = fence_get_rcu(lfence);
411 if (!fence) 409 if (!fence)
412 return -1; 410 return -1;