1 files changed, 4 insertions, 6 deletions

diff --git a/crypto/xcbc.c b/crypto/xcbc.c
index ac68f3b62fde..a82959df678c 100644
--- a/crypto/xcbc.c
+++ b/crypto/xcbc.c
@@ -19,6 +19,7 @@
  *      Kazunori Miyazawa <miyazawa@linux-ipv6.org>
  */
 
+#include <crypto/scatterwalk.h>
 #include <linux/crypto.h>
 #include <linux/err.h>
 #include <linux/hardirq.h>
@@ -27,7 +28,6 @@
 #include <linux/rtnetlink.h>
 #include <linux/slab.h>
 #include <linux/scatterlist.h>
-#include "internal.h"
 
 static u_int32_t ks[12] = {0x01010101, 0x01010101, 0x01010101, 0x01010101,
                            0x02020202, 0x02020202, 0x02020202, 0x02020202,
@@ -307,7 +307,8 @@ static struct crypto_instance *xcbc_alloc(struct rtattr **tb)
         case 16:
                 break;
         default:
-                return ERR_PTR(PTR_ERR(alg));
+                inst = ERR_PTR(-EINVAL);
+                goto out_put_alg;
         }
 
         inst = crypto_alloc_instance("xcbc", alg);
@@ -320,10 +321,7 @@ static struct crypto_instance *xcbc_alloc(struct rtattr **tb)
         inst->alg.cra_alignmask = alg->cra_alignmask;
         inst->alg.cra_type = &crypto_hash_type;
 
-        inst->alg.cra_hash.digestsize =
-                (alg->cra_flags & CRYPTO_ALG_TYPE_MASK) ==
-                CRYPTO_ALG_TYPE_HASH ? alg->cra_hash.digestsize :
-                                       alg->cra_blocksize;
+        inst->alg.cra_hash.digestsize = alg->cra_blocksize;
         inst->alg.cra_ctxsize = sizeof(struct crypto_xcbc_ctx) +
                                 ALIGN(inst->alg.cra_blocksize * 3, sizeof(void *));
         inst->alg.cra_init = xcbc_init_tfm;