diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-26 19:50:02 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-26 19:50:02 -0500 |
commit | 37d4008484977f60d5d37499a2670c79b214dd46 (patch) | |
tree | e73ef4b7c3eee1543e13d7be2ecb1593e77eb123 /arch | |
parent | 68c6b859846bd078b37c6ca5f3882032f129e72d (diff) | |
parent | 8d0c123f8b710561cfd34f6e1a5bebc27988edbe (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (31 commits)
crypto: aes_generic - Fix checkpatch errors
crypto: fcrypt - Fix checkpatch errors
crypto: ecb - Fix checkpatch errors
crypto: des_generic - Fix checkpatch errors
crypto: deflate - Fix checkpatch errors
crypto: crypto_null - Fix checkpatch errors
crypto: cipher - Fix checkpatch errors
crypto: crc32 - Fix checkpatch errors
crypto: compress - Fix checkpatch errors
crypto: cast6 - Fix checkpatch errors
crypto: cast5 - Fix checkpatch errors
crypto: camellia - Fix checkpatch errors
crypto: authenc - Fix checkpatch errors
crypto: api - Fix checkpatch errors
crypto: anubis - Fix checkpatch errors
crypto: algapi - Fix checkpatch errors
crypto: blowfish - Fix checkpatch errors
crypto: aead - Fix checkpatch errors
crypto: ablkcipher - Fix checkpatch errors
crypto: pcrypt - call the complete function on error
...
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-nomadik/cpu-8815.c | 8 | ||||
-rw-r--r-- | arch/s390/crypto/aes_s390.c | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/arch/arm/mach-nomadik/cpu-8815.c b/arch/arm/mach-nomadik/cpu-8815.c index f93c59634191..9bf33b30a025 100644 --- a/arch/arm/mach-nomadik/cpu-8815.c +++ b/arch/arm/mach-nomadik/cpu-8815.c | |||
@@ -86,11 +86,19 @@ static struct amba_device cpu8815_amba_gpio[] = { | |||
86 | }, | 86 | }, |
87 | }; | 87 | }; |
88 | 88 | ||
89 | static struct amba_device cpu8815_amba_rng = { | ||
90 | .dev = { | ||
91 | .init_name = "rng", | ||
92 | }, | ||
93 | __MEM_4K_RESOURCE(NOMADIK_RNG_BASE), | ||
94 | }; | ||
95 | |||
89 | static struct amba_device *amba_devs[] __initdata = { | 96 | static struct amba_device *amba_devs[] __initdata = { |
90 | cpu8815_amba_gpio + 0, | 97 | cpu8815_amba_gpio + 0, |
91 | cpu8815_amba_gpio + 1, | 98 | cpu8815_amba_gpio + 1, |
92 | cpu8815_amba_gpio + 2, | 99 | cpu8815_amba_gpio + 2, |
93 | cpu8815_amba_gpio + 3, | 100 | cpu8815_amba_gpio + 3, |
101 | &cpu8815_amba_rng | ||
94 | }; | 102 | }; |
95 | 103 | ||
96 | static int __init cpu8815_init(void) | 104 | static int __init cpu8815_init(void) |
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, | |||
78 | struct s390_aes_ctx *sctx = crypto_tfm_ctx(tfm); | 78 | struct s390_aes_ctx *sctx = crypto_tfm_ctx(tfm); |
79 | int ret; | 79 | int ret; |
80 | 80 | ||
81 | sctx->fallback.blk->base.crt_flags &= ~CRYPTO_TFM_REQ_MASK; | 81 | sctx->fallback.cip->base.crt_flags &= ~CRYPTO_TFM_REQ_MASK; |
82 | sctx->fallback.blk->base.crt_flags |= (tfm->crt_flags & | 82 | sctx->fallback.cip->base.crt_flags |= (tfm->crt_flags & |
83 | CRYPTO_TFM_REQ_MASK); | 83 | CRYPTO_TFM_REQ_MASK); |
84 | 84 | ||
85 | ret = crypto_cipher_setkey(sctx->fallback.cip, in_key, key_len); | 85 | ret = crypto_cipher_setkey(sctx->fallback.cip, in_key, key_len); |
86 | if (ret) { | 86 | if (ret) { |
87 | tfm->crt_flags &= ~CRYPTO_TFM_RES_MASK; | 87 | tfm->crt_flags &= ~CRYPTO_TFM_RES_MASK; |
88 | tfm->crt_flags |= (sctx->fallback.blk->base.crt_flags & | 88 | tfm->crt_flags |= (sctx->fallback.cip->base.crt_flags & |
89 | CRYPTO_TFM_RES_MASK); | 89 | CRYPTO_TFM_RES_MASK); |
90 | } | 90 | } |
91 | return ret; | 91 | return ret; |