]> git.ipfire.org Git - people/ms/linux.git/commitdiff
reservation: Remove shadowing local variable 'ret'
authorMichel Dänzer <michel.daenzer@amd.com>
Thu, 22 Jan 2015 07:00:17 +0000 (16:00 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 18 Mar 2015 13:11:09 +0000 (14:11 +0100)
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>
drivers/dma-buf/reservation.c

index 3c97c8fa8d02687290e7340f82666f3466fbda2e..8a37af923094ae2bfc7f6c24d9d7a00ea157a1b1 100644 (file)
@@ -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;