Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts:
	drivers/firmware/iscsi_ibft.c

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/s390/crypto/aes_s390.c b/arch/s390/crypto/aes_s390.c
index 6be4503201ac..58f46734465f 100644
--- a/arch/s390/crypto/aes_s390.c
+++ b/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;