diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-06 15:07:36 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-06 15:07:36 -0400 |
commit | 2e4f40d2eb763a17c75c07fff605402737260c59 (patch) | |
tree | 3088834adcaddfb0919698524611b8650e68c912 | |
parent | d6606683a5e3dac35cb979c7195f54ed827567bd (diff) | |
parent | e34a8ae79056e6cea4a1ac21119ee3c91f378f99 (diff) |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
async_tx: fix missing braces in async_xor_zero_sum
-rw-r--r-- | crypto/async_tx/async_xor.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/async_tx/async_xor.c b/crypto/async_tx/async_xor.c index 65974c6d3d7a..c029d3eb9ef0 100644 --- a/crypto/async_tx/async_xor.c +++ b/crypto/async_tx/async_xor.c | |||
@@ -263,11 +263,12 @@ async_xor_zero_sum(struct page *dest, struct page **src_list, | |||
263 | if (unlikely(!tx)) { | 263 | if (unlikely(!tx)) { |
264 | async_tx_quiesce(&depend_tx); | 264 | async_tx_quiesce(&depend_tx); |
265 | 265 | ||
266 | while (!tx) | 266 | while (!tx) { |
267 | dma_async_issue_pending(chan); | 267 | dma_async_issue_pending(chan); |
268 | tx = device->device_prep_dma_zero_sum(chan, | 268 | tx = device->device_prep_dma_zero_sum(chan, |
269 | dma_src, src_cnt, len, result, | 269 | dma_src, src_cnt, len, result, |
270 | dma_prep_flags); | 270 | dma_prep_flags); |
271 | } | ||
271 | } | 272 | } |
272 | 273 | ||
273 | async_tx_submit(chan, tx, flags, depend_tx, cb_fn, cb_param); | 274 | async_tx_submit(chan, tx, flags, depend_tx, cb_fn, cb_param); |