3 files changed, 19 insertions, 16 deletions

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 1e2f39c211..cbae8392ce 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -27,7 +27,6 @@ config CRYPTO_HASH
 config CRYPTO_MANAGER
         tristate "Cryptographic algorithm manager"
         select CRYPTO_ALGAPI
-        default m
         help
           Create default cryptographic template instantiations such as
           cbc(aes).
@@ -35,6 +34,7 @@ config CRYPTO_MANAGER
 config CRYPTO_HMAC
         tristate "HMAC support"
         select CRYPTO_HASH
+        select CRYPTO_MANAGER
         help
           HMAC: Keyed-Hashing for Message Authentication (RFC2104).
           This is required for IPSec.
@@ -131,6 +131,7 @@ config CRYPTO_TGR192
 config CRYPTO_ECB
         tristate "ECB support"
         select CRYPTO_BLKCIPHER
+        select CRYPTO_MANAGER
         default m
         help
           ECB: Electronic CodeBook mode
@@ -140,6 +141,7 @@ config CRYPTO_ECB
 config CRYPTO_CBC
         tristate "CBC support"
         select CRYPTO_BLKCIPHER
+        select CRYPTO_MANAGER
         default m
         help
           CBC: Cipher Block Chaining mode
diff --git a/crypto/api.c b/crypto/api.c
index 2e84d4b547..4fb7fa45cb 100644
--- a/crypto/api.c
+++ b/crypto/api.c
@@ -331,7 +331,7 @@ struct crypto_tfm *__crypto_alloc_tfm(struct crypto_alg *alg, u32 flags)
         tfm_size = sizeof(*tfm) + crypto_ctxsize(alg, flags);
         tfm = kzalloc(tfm_size, GFP_KERNEL);
         if (tfm == NULL)
-                goto out;
+                goto out_err;
 
         tfm->__crt_alg = alg;
 
@@ -355,6 +355,7 @@ cra_init_failed:
         crypto_exit_ops(tfm);
 out_free_tfm:
         kfree(tfm);
+out_err:
         tfm = ERR_PTR(err);
 out:
         return tfm;
@@ -414,14 +415,14 @@ struct crypto_tfm *crypto_alloc_base(const char *alg_name, u32 type, u32 mask)
                 struct crypto_alg *alg;
 
                 alg = crypto_alg_mod_lookup(alg_name, type, mask);
-                err = PTR_ERR(alg);
-                tfm = ERR_PTR(err);
-                if (IS_ERR(alg))
+                if (IS_ERR(alg)) {
+                        err = PTR_ERR(alg);
                         goto err;
+                }
 
                 tfm = __crypto_alloc_tfm(alg, 0);
                 if (!IS_ERR(tfm))
-                        break;
+                        return tfm;
 
                 crypto_mod_put(alg);
                 err = PTR_ERR(tfm);
@@ -433,9 +434,9 @@ err:
                         err = -EINTR;
                         break;
                 }
-        };
+        }
 
-        return tfm;
+        return ERR_PTR(err);
 }
 EXPORT_SYMBOL_GPL(crypto_alloc_base);
  
diff --git a/crypto/serpent.c b/crypto/serpent.c
index 465d091cd3..2b0a19a44e 100644
--- a/crypto/serpent.c
+++ b/crypto/serpent.c
@@ -364,10 +364,10 @@ static void serpent_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
 {
         struct serpent_ctx *ctx = crypto_tfm_ctx(tfm);
         const u32
-                *k = ctx->expkey,
-                *s = (const u32 *)src;
-        u32     *d = (u32 *)dst,
-                r0, r1, r2, r3, r4;
+                *k = ctx->expkey;
+        const __le32 *s = (const __le32 *)src;
+        __le32  *d = (__le32 *)dst;
+        u32     r0, r1, r2, r3, r4;
 
 /*
  * Note: The conversions between u8* and u32* might cause trouble
@@ -423,10 +423,10 @@ static void serpent_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
 {
         struct serpent_ctx *ctx = crypto_tfm_ctx(tfm);
         const u32
-                *k = ((struct serpent_ctx *)ctx)->expkey,
-                *s = (const u32 *)src;
-        u32     *d = (u32 *)dst,
-                r0, r1, r2, r3, r4;
+                *k = ((struct serpent_ctx *)ctx)->expkey;
+        const __le32 *s = (const __le32 *)src;
+        __le32  *d = (__le32 *)dst;
+        u32     r0, r1, r2, r3, r4;
 
         r0 = le32_to_cpu(s[0]);
         r1 = le32_to_cpu(s[1]);