---

yaml --- r: 371103 b: refs/heads/master c: eb16796 h: refs/heads/master i: 371101: 2a60df4 371099: c770767 371095: e8ecfe3 371087: 2506a19 371071: d45da24 v: v3
git-mirror · Apr 3, 2013 · 997c46f · 997c46f
1 parent 444af3f
commit 997c46f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -939,13 +939,15 @@ 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;
 	}
 
 	bytes_written = hash_dma_write(ctx, req->src, req->nbytes);
 	if (bytes_written != req->nbytes) {
 		dev_err(device_data->dev, "[%s] "
 				"hash_dma_write() failed!", __func__);
+		ret = bytes_written;
 		goto out;
 	}