Merge tag 'gfs2-v5.17-rc4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / dma-buf / st-dma-resv.c

diff --git a/drivers/dma-buf/st-dma-resv.c b/drivers/dma-buf/st-dma-resv.c
index bc32b3e..cbe999c 100644 (file)
--- a/drivers/dma-buf/st-dma-resv.c
+++ b/drivers/dma-buf/st-dma-resv.c
@@ -275,7 +275,7 @@ static int test_shared_for_each_unlocked(void *arg)
 
 static int test_get_fences(void *arg, bool shared)
 {
-       struct dma_fence *f, *excl = NULL, **fences = NULL;
+       struct dma_fence *f, **fences = NULL;
        struct dma_resv resv;
        int r, i;
 
@@ -304,35 +304,19 @@ static int test_get_fences(void *arg, bool shared)
        }
        dma_resv_unlock(&resv);
 
-       r = dma_resv_get_fences(&resv, &excl, &i, &fences);
+       r = dma_resv_get_fences(&resv, shared, &i, &fences);
        if (r) {
                pr_err("get_fences failed\n");
                goto err_free;
        }
 
-       if (shared) {
-               if (excl != NULL) {
-                       pr_err("get_fences returned unexpected excl fence\n");
-                       goto err_free;
-               }
-               if (i != 1 || fences[0] != f) {
-                       pr_err("get_fences returned unexpected shared fence\n");
-                       goto err_free;
-               }
-       } else {
-               if (excl != f) {
-                       pr_err("get_fences returned unexpected excl fence\n");
-                       goto err_free;
-               }
-               if (i != 0) {
-                       pr_err("get_fences returned unexpected shared fence\n");
-                       goto err_free;
-               }
+       if (i != 1 || fences[0] != f) {
+               pr_err("get_fences returned unexpected fence\n");
+               goto err_free;
        }
 
        dma_fence_signal(f);
 err_free:
-       dma_fence_put(excl);
        while (i--)
                dma_fence_put(fences[i]);
        kfree(fences);