From 2adbe942430bb3e496bef3a8e248e1e66e779b42 Mon Sep 17 00:00:00 2001
From: Dan Williams <dan.j.williams@intel.com>
Date: Thu, 5 Jun 2008 23:26:11 -0700
Subject: [PATCH] --- yaml --- r: 105055 b: refs/heads/master c:
 65bc3ffe8c067e387fe5557bc3ea5071071f6af9 h: refs/heads/master i:   105053:
 43b69978dd7022faaa81957abc9b89c5c6303655   105051:
 a60e1df9a809b4a916a2e51ec690f478ee89dfb0   105047:
 4f9b767fef665c06df6676bad5d681815dfca034   105039:
 0744b434e38d681172fbf2168c5334abb84c6002   105023:
 810b4c90f5d31b3f12bdfea9d1ed387b34eeb131 v: v3

---
 [refs]                               | 2 +-
 trunk/crypto/async_tx/async_memset.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0b2f662eb041..d32134b95360 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 51ee87f27a1d2c0e08492924f2fb0223c4c704d9
+refs/heads/master: 65bc3ffe8c067e387fe5557bc3ea5071071f6af9
diff --git a/trunk/crypto/async_tx/async_memset.c b/trunk/crypto/async_tx/async_memset.c
index f5ff3906b035..27a97dc90a7e 100644
--- a/trunk/crypto/async_tx/async_memset.c
+++ b/trunk/crypto/async_tx/async_memset.c
@@ -76,7 +76,7 @@ async_memset(struct page *dest, int val, 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 depend_tx\n",
 					__func__);