diff options
| author | Max Filippov <jcmvbkbc@gmail.com> | 2016-11-06 23:31:10 -0800 |
|---|---|---|
| committer | Max Filippov <jcmvbkbc@gmail.com> | 2016-11-06 23:31:10 -0800 |
| commit | d6c7f8ac7b17995a9ec714e55d70d9f337eeac61 (patch) | |
| tree | 2e1fe96499843f9ee1a2c80c687dcc5eaddb434b /crypto/async_tx/async_pq.c | |
| parent | 2fc3750b483ab74709f99072ac6ccc5ea9f0ae13 (diff) | |
| parent | 736d25df198dddeec82f61fee130f7d0e4212a9c (diff) | |
| download | linux-crypto-d6c7f8ac7b17995a9ec714e55d70d9f337eeac61.tar.gz linux-crypto-d6c7f8ac7b17995a9ec714e55d70d9f337eeac61.zip | |
Merge tag 'v4.9-rc3' into xtensa-for-next
Linux 4.9-rc3
Diffstat (limited to 'crypto/async_tx/async_pq.c')
| -rw-r--r-- | crypto/async_tx/async_pq.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/async_tx/async_pq.c b/crypto/async_tx/async_pq.c index 08b3ac68..f83de99d 100644 --- 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); |