summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-08-06 21:07:36 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-06 21:07:36 +0200
commit2e4f40d2eb763a17c75c07fff605402737260c59 (patch)
tree3088834adcaddfb0919698524611b8650e68c912
parentRevert duplicate "mm/hugetlb.c must #include <asm/io.h>" (diff)
parentasync_tx: fix missing braces in async_xor_zero_sum (diff)
downloadlinux-2e4f40d2eb763a17c75c07fff605402737260c59.tar.xz
linux-2e4f40d2eb763a17c75c07fff605402737260c59.zip
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.c3
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,
if (unlikely(!tx)) {
async_tx_quiesce(&depend_tx);
- while (!tx)
+ while (!tx) {
dma_async_issue_pending(chan);
tx = device->device_prep_dma_zero_sum(chan,
dma_src, src_cnt, len, result,
dma_prep_flags);
+ }
}
async_tx_submit(chan, tx, flags, depend_tx, cb_fn, cb_param);