Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus

[linux-drm-fsl-dcu.git] / crypto / algapi.c

diff --git a/crypto/algapi.c b/crypto/algapi.c
index 3e4524e6139bcf3b58e8f44a8de33a96e9333aee..c3cf1a69a47a8dcaa57e62410c9823ee4e2d045b 100644 (file)
--- a/crypto/algapi.c
+++ b/crypto/algapi.c
@@ -17,6 +17,7 @@
 #include <linux/list.h>
 #include <linux/module.h>
 #include <linux/rtnetlink.h>
+#include <linux/slab.h>
 #include <linux/string.h>
 
 #include "internal.h"
@@ -543,7 +544,7 @@ int crypto_init_spawn2(struct crypto_spawn *spawn, struct crypto_alg *alg,
 {
        int err = -EINVAL;
 
-       if (frontend && (alg->cra_flags ^ frontend->type) & frontend->maskset)
+       if ((alg->cra_flags ^ frontend->type) & frontend->maskset)
                goto out;
 
        spawn->frontend = frontend;