diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-31 09:44:52 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-31 09:44:52 +0000 |
| commit | 5bca889af9ee712d0dac3b61b1cec79e7c99ec58 (patch) | |
| tree | f2cefd580d49799f5baac0593e6b70c1503410b2 /crypto | |
| parent | b7cd0dbce754d20e841b0c27c177ea91e96481f3 (diff) | |
| parent | cd2c5381cba9b0c40519b25841315621738688a0 (diff) | |
Merge tag 'v3.14.23' into linux-linaro-lsk-v3.14
This is the 3.14.23 stable release
Conflicts:
arch/s390/kvm/interrupt.c
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/async_tx/async_xor.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/crypto/async_tx/async_xor.c b/crypto/async_tx/async_xor.c index 3c562f5a60bb..e1bce26cd4f9 100644 --- a/crypto/async_tx/async_xor.c +++ b/crypto/async_tx/async_xor.c @@ -78,8 +78,6 @@ do_async_xor(struct dma_chan *chan, struct dmaengine_unmap_data *unmap, tx = dma->device_prep_dma_xor(chan, dma_dest, src_list, xor_src_cnt, unmap->len, dma_flags); - src_list[0] = tmp; - if (unlikely(!tx)) async_tx_quiesce(&submit->depend_tx); @@ -92,6 +90,7 @@ do_async_xor(struct dma_chan *chan, struct dmaengine_unmap_data *unmap, xor_src_cnt, unmap->len, dma_flags); } + src_list[0] = tmp; dma_set_unmap(tx, unmap); async_tx_submit(chan, tx, submit); |