diff --git a/[refs] b/[refs]
index d2f820fc33ae..e1576635eced 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07bf44f86989f5ed866510374fe761d1903681fb
+refs/heads/master: 1693531e9ef11959300617c68a8322ad006b5475
diff --git a/trunk/crypto/shash.c b/trunk/crypto/shash.c
index d5a2b619c55f..13a0dc150a4d 100644
--- a/trunk/crypto/shash.c
+++ b/trunk/crypto/shash.c
@@ -442,8 +442,6 @@ static unsigned int crypto_shash_ctxsize(struct crypto_alg *alg, u32 type,
 static int crypto_shash_init_tfm(struct crypto_tfm *tfm,
 				 const struct crypto_type *frontend)
 {
-	if (frontend->type != CRYPTO_ALG_TYPE_SHASH)
-		return -EINVAL;
 	return 0;
 }