From 6eb09803d70dc29f304e76c5f186ad174befd2c6 Mon Sep 17 00:00:00 2001
From: Roel Kluin <roel.kluin@gmail.com>
Date: Fri, 18 Dec 2009 17:43:18 +0100
Subject: [PATCH] --- yaml --- r: 178000 b: refs/heads/master c:
 b59cdcb339fc7286161b80403f6af63acf26876f h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/arch/s390/crypto/aes_s390.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a0d888f40ffb..4e28f75f25b8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d53cfe590c17c28ebae2c869bb7a5ab9554b4da
+refs/heads/master: b59cdcb339fc7286161b80403f6af63acf26876f
diff --git a/trunk/arch/s390/crypto/aes_s390.c b/trunk/arch/s390/crypto/aes_s390.c
index 6118890c946d..6be4503201ac 100644
--- a/trunk/arch/s390/crypto/aes_s390.c
+++ b/trunk/arch/s390/crypto/aes_s390.c
@@ -174,7 +174,7 @@ static int fallback_init_cip(struct crypto_tfm *tfm)
 	if (IS_ERR(sctx->fallback.cip)) {
 		pr_err("Allocating AES fallback algorithm %s failed\n",
 		       name);
-		return PTR_ERR(sctx->fallback.blk);
+		return PTR_ERR(sctx->fallback.cip);
 	}
 
 	return 0;