From 549533075ecd81066b4e4317c595de118ae16260 Mon Sep 17 00:00:00 2001
From: Roel Kluin <roel.kluin@gmail.com>
Date: Fri, 8 Jan 2010 14:18:34 +1100
Subject: [PATCH] --- yaml --- r: 181007 b: refs/heads/master c:
 d7ac769068df87ca8c7f72d99cf67ead16739f18 h: refs/heads/master i:   181005:
 c7208a9d7a70ac501df678a763f153a1cc00d050   181003:
 d28a84cde7e37f827771de9f7aa99081d81003fd   180999:
 a6693d6bf53b262700125a106a72f48a75a74af4   180991:
 6d7d29831576d80148d07f65c664e457938e9716 v: v3

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

diff --git a/[refs] b/[refs]
index 6c6716f502ed..00cbb1abf88d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5068c7a883d1694f0fb3631b664827644153cd08
+refs/heads/master: d7ac769068df87ca8c7f72d99cf67ead16739f18
diff --git a/trunk/arch/s390/crypto/aes_s390.c b/trunk/arch/s390/crypto/aes_s390.c
index 6118890c946d..9ed05bcd19b0 100644
--- a/trunk/arch/s390/crypto/aes_s390.c
+++ b/trunk/arch/s390/crypto/aes_s390.c
@@ -78,14 +78,14 @@ static int setkey_fallback_cip(struct crypto_tfm *tfm, const u8 *in_key,
 	struct s390_aes_ctx *sctx = crypto_tfm_ctx(tfm);
 	int ret;
 
-	sctx->fallback.blk->base.crt_flags &= ~CRYPTO_TFM_REQ_MASK;
-	sctx->fallback.blk->base.crt_flags |= (tfm->crt_flags &
+	sctx->fallback.cip->base.crt_flags &= ~CRYPTO_TFM_REQ_MASK;
+	sctx->fallback.cip->base.crt_flags |= (tfm->crt_flags &
 			CRYPTO_TFM_REQ_MASK);
 
 	ret = crypto_cipher_setkey(sctx->fallback.cip, in_key, key_len);
 	if (ret) {
 		tfm->crt_flags &= ~CRYPTO_TFM_RES_MASK;
-		tfm->crt_flags |= (sctx->fallback.blk->base.crt_flags &
+		tfm->crt_flags |= (sctx->fallback.cip->base.crt_flags &
 				CRYPTO_TFM_RES_MASK);
 	}
 	return ret;