diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-18 08:38:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-18 08:38:55 -0700 |
| commit | 07fe944e87d79f8d7e1b090913fe9f2ace78f41d (patch) | |
| tree | b20a3576d61d4dc3d89cf47515a786b31fd997d6 /crypto/async_tx/async_xor.c | |
| parent | 8019aa946af5218bc4446c21e43cc19c9401ac68 (diff) | |
| parent | 636bdeaa1243327501edfd2a597ed7443eb4239a (diff) | |
| download | linux-07fe944e87d79f8d7e1b090913fe9f2ace78f41d.tar.gz linux-07fe944e87d79f8d7e1b090913fe9f2ace78f41d.tar.bz2 linux-07fe944e87d79f8d7e1b090913fe9f2ace78f41d.zip | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
dmaengine: ack to flags: make use of the unused bits in the 'ack' field
iop-adma: remove the workaround for missed interrupts on iop3xx
async_tx: kill ->device_dependency_added
async_tx: fix multiple dependency submission
fsldma: Split the MPC83xx event from MPC85xx and refine irq codes.
fsldma: Remove CONFIG_FSL_DMA_SELFTEST, keep fsl_dma_self_test() running always.
Diffstat (limited to 'crypto/async_tx/async_xor.c')
| -rw-r--r-- | crypto/async_tx/async_xor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/async_tx/async_xor.c b/crypto/async_tx/async_xor.c index 1c445c7bdab7..3a0dddca5a10 100644 --- a/crypto/async_tx/async_xor.c +++ b/crypto/async_tx/async_xor.c @@ -191,7 +191,7 @@ async_xor(struct page *dest, struct page **src_list, unsigned int offset, /* if ack is already set then we cannot be sure * we are referring to the correct operation */ - BUG_ON(depend_tx->ack); + BUG_ON(async_tx_test_ack(depend_tx)); if (dma_wait_for_async_tx(depend_tx) == DMA_ERROR) panic("%s: DMA_ERROR waiting for " |