2 files changed, 3 insertions, 3 deletions

diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c
index f0aed0106adb..11f935953816 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 e678a33ea672..bb90cbd7ca51 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)