diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-11 16:44:25 -0400 |
| commit | 1c01a80cfec6f806246f31ff2680cd3639b30e67 (patch) | |
| tree | 0b554aad2ec1da71ecf6339d4ba51617bfe1dc3c /crypto/async_tx | |
| parent | c44d79950b2daa1025e62eede73e4e4a274d1ef3 (diff) | |
| parent | 4a9f65f6304a00f6473e83b19c1e83caa1e42530 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/smsc911x.c
Diffstat (limited to 'crypto/async_tx')
| -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 079ae8ca590..bc28337fded 100644 --- a/crypto/async_tx/async_xor.c +++ b/crypto/async_tx/async_xor.c | |||
| @@ -94,7 +94,7 @@ do_async_xor(struct dma_chan *chan, struct page *dest, struct page **src_list, | |||
| 94 | if (unlikely(!tx)) | 94 | if (unlikely(!tx)) |
| 95 | async_tx_quiesce(&submit->depend_tx); | 95 | async_tx_quiesce(&submit->depend_tx); |
| 96 | 96 | ||
| 97 | /* spin wait for the preceeding transactions to complete */ | 97 | /* spin wait for the preceding transactions to complete */ |
| 98 | while (unlikely(!tx)) { | 98 | while (unlikely(!tx)) { |
| 99 | dma_async_issue_pending(chan); | 99 | dma_async_issue_pending(chan); |
| 100 | tx = dma->device_prep_dma_xor(chan, dma_dest, | 100 | tx = dma->device_prep_dma_xor(chan, dma_dest, |