Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / crypto / async_tx / async_pq.c

diff --git a/crypto/async_tx/async_pq.c b/crypto/async_tx/async_pq.c
index 08b3ac6..f83de99 100644 (file)
--- a/crypto/async_tx/async_pq.c
+++ b/crypto/async_tx/async_pq.c
@@ -368,8 +368,6 @@ async_syndrome_val(struct page **blocks, unsigned int offset, int disks,
 
                dma_set_unmap(tx, unmap);
                async_tx_submit(chan, tx, submit);
-
-               return tx;
        } else {
                struct page *p_src = P(blocks, disks);
                struct page *q_src = Q(blocks, disks);
@@ -424,9 +422,11 @@ async_syndrome_val(struct page **blocks, unsigned int offset, int disks,
                submit->cb_param = cb_param_orig;
                submit->flags = flags_orig;
                async_tx_sync_epilog(submit);
-
-               return NULL;
+               tx = NULL;
        }
+       dmaengine_unmap_put(unmap);
+
+       return tx;
 }
 EXPORT_SYMBOL_GPL(async_syndrome_val);