From 997c46fce5abcd5e66b864f1744afbfa5c028b6d Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Fri, 22 Mar 2013 21:18:44 +0800
Subject: [PATCH] --- yaml --- r: 371103 b: refs/heads/master c:
 eb16796302bad44fd346d4e0e15f8086132d1363 h: refs/heads/master i:   371101:
 2a60df4f6a2cb4409f93f6a6edde83936837e167   371099:
 c770767caa53a9e26748a3474bedf664246ad4a6   371095:
 e8ecfe349d476b222c815e8434d70142c4d28f47   371087:
 2506a1915c853f14389805ce06bf8909c6edf69d   371071:
 d45da2471a72d8241fb24e36e2834b8e81e94557 v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/crypto/ux500/hash/hash_core.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0cb2898e8f14..7e7dbbe26585 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5cec26e9843e4f16974e5a30a3ffada1557b661d
+refs/heads/master: eb16796302bad44fd346d4e0e15f8086132d1363
diff --git a/trunk/drivers/crypto/ux500/hash/hash_core.c b/trunk/drivers/crypto/ux500/hash/hash_core.c
index 8d16d3aa7650..d99b671769d9 100644
--- a/trunk/drivers/crypto/ux500/hash/hash_core.c
+++ b/trunk/drivers/crypto/ux500/hash/hash_core.c
@@ -939,6 +939,7 @@ static int hash_dma_final(struct ahash_request *req)
 	if (!ctx->device->dma.nents) {
 		dev_err(device_data->dev, "[%s] "
 				"ctx->device->dma.nents = 0", __func__);
+		ret = ctx->device->dma.nents;
 		goto out;
 	}
 
@@ -946,6 +947,7 @@ static int hash_dma_final(struct ahash_request *req)
 	if (bytes_written != req->nbytes) {
 		dev_err(device_data->dev, "[%s] "
 				"hash_dma_write() failed!", __func__);
+		ret = bytes_written;
 		goto out;
 	}