summaryrefslogtreecommitdiffstats
path: root/drivers/dma-buf
diff options
context:
space:
mode:
authorMichel Dänzer <michel.daenzer@amd.com>2015-01-22 16:00:17 +0900
committerSumit Semwal <sumit.semwal@linaro.org>2015-01-22 16:29:31 +0530
commit4eb2440ed60fb5793f7aa6da89b3d517cc59de43 (patch)
tree006c9a11c5cc0e534bed38ea71c108ee3ef0d8fb /drivers/dma-buf
parent847b19a39e4c9b5e74c40f0842c48b41664cb43c (diff)
downloadlinux-stable-4eb2440ed60fb5793f7aa6da89b3d517cc59de43.tar.gz
linux-stable-4eb2440ed60fb5793f7aa6da89b3d517cc59de43.tar.bz2
linux-stable-4eb2440ed60fb5793f7aa6da89b3d517cc59de43.zip
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>
Diffstat (limited to 'drivers/dma-buf')
-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)
int ret = 1;
if (!test_bit(FENCE_FLAG_SIGNALED_BIT, &lfence->flags)) {
- int ret;
-
fence = fence_get_rcu(lfence);
if (!fence)
return -1;