diff options
| author | Scott Wood <scottwood@freescale.com> | 2014-04-08 21:06:11 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-08 21:06:11 (GMT) |
| commit | d0b794f24c934bb076ffd28df316798f1707cf13 (patch) | |
| tree | 0b5cf9ac0ae37705fc0defa6f43585a0d1285f21 /crypto/async_tx/async_tx.c | |
| parent | 47d2261a3fa71cde24263559a4219a25e50d8c89 (diff) | |
| download | linux-fsl-qoriq-d0b794f24c934bb076ffd28df316798f1707cf13.tar.xz | |
Fix build breaks in dma engine users
The dma engine was exempted from the 3.12 rollback because of
excessive conflicts. Some users needed to be adjusted (net/ipv4/tcp.c)
or exempted themselves (async_tx).
Signed-off-by: Scott Wood <scottwood@freescale.com>
Diffstat (limited to 'crypto/async_tx/async_tx.c')
| -rw-r--r-- | crypto/async_tx/async_tx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/async_tx/async_tx.c b/crypto/async_tx/async_tx.c index 7be3424..39ea479 100644 --- a/crypto/async_tx/async_tx.c +++ b/crypto/async_tx/async_tx.c @@ -128,7 +128,7 @@ async_tx_channel_switch(struct dma_async_tx_descriptor *depend_tx, } device->device_issue_pending(chan); } else { - if (dma_wait_for_async_tx(depend_tx) != DMA_SUCCESS) + if (dma_wait_for_async_tx(depend_tx) != DMA_COMPLETE) panic("%s: DMA error waiting for depend_tx\n", __func__); tx->tx_submit(tx); @@ -280,7 +280,7 @@ void async_tx_quiesce(struct dma_async_tx_descriptor **tx) * we are referring to the correct operation */ BUG_ON(async_tx_test_ack(*tx)); - if (dma_wait_for_async_tx(*tx) != DMA_SUCCESS) + if (dma_wait_for_async_tx(*tx) != DMA_COMPLETE) panic("%s: DMA error waiting for transaction\n", __func__); async_tx_ack(*tx); |