Merge tag 'nbd_fixes_20150305' of git://git.pengutronix.de/git/mpa/li…

…nux-nbd into for-linus NBD fixes based on v4.0-rc1
cbmeeks · Mar 5, 2015 · b8be79b · b8be79b
2 parents 7d70e15 + ff6b809
commit b8be79b
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
@@ -803,10 +803,6 @@ static int __init nbd_init(void)
 		return -EINVAL;
 	}
 
-	nbd_dev = kcalloc(nbds_max, sizeof(*nbd_dev), GFP_KERNEL);
-	if (!nbd_dev)
-		return -ENOMEM;
-
 	part_shift = 0;
 	if (max_part > 0) {
 		part_shift = fls(max_part);
@@ -828,6 +824,10 @@ static int __init nbd_init(void)
 	if (nbds_max > 1UL << (MINORBITS - part_shift))
 		return -EINVAL;
 
+	nbd_dev = kcalloc(nbds_max, sizeof(*nbd_dev), GFP_KERNEL);
+	if (!nbd_dev)
+		return -ENOMEM;
+
 	for (i = 0; i < nbds_max; i++) {
 		struct gendisk *disk = alloc_disk(1 << part_shift);
 		if (!disk)