X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=crypto%2Fasync_tx%2Fasync_memset.c;h=5b5eb99bb244311bb1456c62080249d812967be4;hb=2d25ee36c84d5b2d6be8bfaf80256ecad69a06ca;hp=27a97dc90a7e0f7f6504c54925c0541611fc604c;hpb=65bc3ffe8c067e387fe5557bc3ea5071071f6af9;p=~andy%2Flinux

diff --git a/crypto/async_tx/async_memset.c b/crypto/async_tx/async_memset.c
index 27a97dc90a7..5b5eb99bb24 100644
--- a/crypto/async_tx/async_memset.c
+++ b/crypto/async_tx/async_memset.c
@@ -72,19 +72,11 @@ async_memset(struct page *dest, int val, unsigned int offset,
 		dest_buf = (void *) (((char *) page_address(dest)) + offset);
 
 		/* wait for any prerequisite operations */
-		if (depend_tx) {
-			/* if ack is already set then we cannot be sure
-			 * we are referring to the correct operation
-			 */
-			BUG_ON(async_tx_test_ack(depend_tx));
-			if (dma_wait_for_async_tx(depend_tx) == DMA_ERROR)
-				panic("%s: DMA_ERROR waiting for depend_tx\n",
-					__func__);
-		}
+		async_tx_quiesce(&depend_tx);
 
 		memset(dest_buf, val, len);
 
-		async_tx_sync_epilog(flags, depend_tx, cb_fn, cb_param);
+		async_tx_sync_epilog(cb_fn, cb_param);
 	}
 
 	return tx;