From 7c6166f17ec392d82e1a1e344bfeca49d7b25923 Mon Sep 17 00:00:00 2001 From: Roel Kluin Date: Thu, 4 Feb 2010 11:39:13 +1100 Subject: [PATCH] --- yaml --- r: 181012 b: refs/heads/master c: e054f1647162d7098a9ff619405a72bd7c417213 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/crypto/geode-aes.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 33cac8d57c12..a187eeca7a95 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7d6f75eb21b84cdc5dfb09789974f02b42a89058 +refs/heads/master: e054f1647162d7098a9ff619405a72bd7c417213 diff --git a/trunk/drivers/crypto/geode-aes.c b/trunk/drivers/crypto/geode-aes.c index 03e71b1a5128..c7a5a43ba691 100644 --- a/trunk/drivers/crypto/geode-aes.c +++ b/trunk/drivers/crypto/geode-aes.c @@ -141,7 +141,7 @@ static int geode_setkey_cip(struct crypto_tfm *tfm, const u8 *key, ret = crypto_cipher_setkey(op->fallback.cip, key, len); if (ret) { tfm->crt_flags &= ~CRYPTO_TFM_RES_MASK; - tfm->crt_flags |= (op->fallback.blk->base.crt_flags & CRYPTO_TFM_RES_MASK); + tfm->crt_flags |= (op->fallback.cip->base.crt_flags & CRYPTO_TFM_RES_MASK); } return ret; }