Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[firefly-linux-kernel-4.4.55.git] / mm / zbud.c

diff --git a/mm/zbud.c b/mm/zbud.c
index ec71b37fb06cc9b9707314857bd8ba0addbb8394..4e387bea702eca644da2547c3bd8f9537291c189 100644 (file)
--- a/mm/zbud.c
+++ b/mm/zbud.c
@@ -132,7 +132,7 @@ static struct zbud_ops zbud_zpool_ops = {
 
 static void *zbud_zpool_create(gfp_t gfp, struct zpool_ops *zpool_ops)
 {
-       return zbud_create_pool(gfp, &zbud_zpool_ops);
+       return zbud_create_pool(gfp, zpool_ops ? &zbud_zpool_ops : NULL);
 }
 
 static void zbud_zpool_destroy(void *pool)