Commit 5c42ea16 authored by Keith Busch's avatar Keith Busch Committed by Matthew Wilcox
Browse files

NVMe: Fix nvme module init when nvme_major is set 



register_blkdev returns 0 when given a valid major number.

Reported-by: default avatarRoss Zwisler <ross.zwisler@intel.com>
Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
Signed-off-by: default avatarMatthew Wilcox <matthew.r.wilcox@intel.com>
parent e9ef4636

drivers/block/nvme.c

+4 −2
Original line number Diff line number Diff line
@@ -1716,9 +1716,11 @@ static int __init nvme_init(void) 
	if (IS_ERR(nvme_thread))

		return PTR_ERR(nvme_thread);



	nvme_major = register_blkdev(nvme_major, "nvme");

	if (nvme_major <= 0)

	result = register_blkdev(nvme_major, "nvme");

	if (result < 0)

		goto kill_kthread;

	else if (result > 0)

	    nvme_major = result;



	result = pci_register_driver(&nvme_driver);

	if (result)