diff options
| author | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2012-11-08 11:03:16 +0100 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2013-01-08 07:05:12 +0100 |
| commit | 7d283397ade3c9e51de644676a6593e1f724ac00 (patch) | |
| tree | 8b56fa0af94d8cd8d85d6f7cd6cc4f7a451445e6 /crypto/async_tx | |
| parent | dmaengine: add cpu_relax() to busy-loop in dma_sync_wait() (diff) | |
| download | linux-7d283397ade3c9e51de644676a6593e1f724ac00.tar.xz linux-7d283397ade3c9e51de644676a6593e1f724ac00.zip | |
async_tx: fix checking of dma_wait_for_async_tx() return value
dma_wait_for_async_tx() can also return DMA_PAUSED (which
should be considered as error).
Cc: Vinod Koul <vinod.koul@intel.com>
Cc: Dan Williams <djbw@fb.com>
Cc: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Dan Williams <djbw@fb.com>
Diffstat (limited to 'crypto/async_tx')
| -rw-r--r-- | crypto/async_tx/async_tx.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/crypto/async_tx/async_tx.c b/crypto/async_tx/async_tx.c index 842120979374..7be34248b450 100644 --- a/crypto/async_tx/async_tx.c +++ b/crypto/async_tx/async_tx.c @@ -128,8 +128,8 @@ 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_ERROR) - panic("%s: DMA_ERROR waiting for depend_tx\n", + if (dma_wait_for_async_tx(depend_tx) != DMA_SUCCESS) + panic("%s: DMA error waiting for depend_tx\n", __func__); tx->tx_submit(tx); } @@ -280,8 +280,9 @@ 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_ERROR) - panic("DMA_ERROR waiting for transaction\n"); + if (dma_wait_for_async_tx(*tx) != DMA_SUCCESS) + panic("%s: DMA error waiting for transaction\n", + __func__); async_tx_ack(*tx); *tx = NULL; } |