diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-18 20:46:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-18 20:46:45 -0700 |
| commit | 66123549dbd75c67509c73b9d94bf7a9d2f4b286 (patch) | |
| tree | 98588139d6cf56d524e5ce09d736f882f8e1bd4f | |
| parent | 1a06a52ee1b0cdb65222474ba6186f3991df68b0 (diff) | |
| parent | 29059d12e0c7f349aca6993acac20c5efbe13b81 (diff) | |
| download | linux-3.10-66123549dbd75c67509c73b9d94bf7a9d2f4b286.tar.gz linux-3.10-66123549dbd75c67509c73b9d94bf7a9d2f4b286.tar.bz2 linux-3.10-66123549dbd75c67509c73b9d94bf7a9d2f4b286.zip | |
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:
[CRYPTO] tcrypt: Add missing error check
[CRYPTO] padlock: Make CRYPTO_DEV_PADLOCK a tristate again
| -rw-r--r-- | crypto/tcrypt.c | 2 | ||||
| -rw-r--r-- | drivers/crypto/Kconfig | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c index f0aed0106ad..11f93595381 100644 --- a/crypto/tcrypt.c +++ b/crypto/tcrypt.c @@ -691,7 +691,7 @@ static int test_hash_cycles(struct hash_desc *desc, char *p, int blen, if (ret) goto out; } - crypto_hash_final(desc, out); + ret = crypto_hash_final(desc, out); if (ret) goto out; } diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index e678a33ea67..bb90cbd7ca5 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig @@ -1,10 +1,10 @@ menu "Hardware crypto devices" config CRYPTO_DEV_PADLOCK - bool "Support for VIA PadLock ACE" + tristate "Support for VIA PadLock ACE" depends on X86_32 select CRYPTO_ALGAPI - default y + default m help Some VIA processors come with an integrated crypto engine (so called VIA PadLock ACE, Advanced Cryptography Engine) |