summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichel Dänzer <michel.daenzer@amd.com>2015-01-22 16:00:17 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-03-18 14:11:09 +0100
commite00076b74987cf251b6a5788d590b32db9ccb400 (patch)
tree0bf8f4d83869356f6aae234852005315ea5d66b1
parent9c0f288d39f786bdcaa0c8666e05f1ff747b2aac (diff)
downloadlinux-stable-e00076b74987cf251b6a5788d590b32db9ccb400.tar.gz
reservation: Remove shadowing local variable 'ret'
commit 4eb2440ed60fb5793f7aa6da89b3d517cc59de43 upstream. It was causing the return value of fence_is_signaled to be ignored, making reservation objects signal too early. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.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 3c97c8fa8d02..8a37af923094 100644
--- a/drivers/dma-buf/reservation.c
+++ b/drivers/dma-buf/reservation.c
@@ -402,8 +402,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;