summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeith Busch <keith.busch@intel.com>2012-07-25 16:05:18 -0600
committerMatthew Wilcox <matthew.r.wilcox@intel.com>2012-07-26 12:23:38 -0400
commit5c42ea1643a630060f9e71e06d3933d244970967 (patch)
tree45a0acae315367d8807ccf0a128dcfd3138b430d
parente9ef46369f5107e634a93b7fc4e62a1f53343197 (diff)
downloadop-kernel-dev-5c42ea1643a630060f9e71e06d3933d244970967.zip
op-kernel-dev-5c42ea1643a630060f9e71e06d3933d244970967.tar.gz
NVMe: Fix nvme module init when nvme_major is set
register_blkdev returns 0 when given a valid major number. Reported-by:Ross Zwisler <ross.zwisler@intel.com> Signed-off-by: Keith Busch <keith.busch@intel.com> Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
-rw-r--r--drivers/block/nvme.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/block/nvme.c b/drivers/block/nvme.c
index 38b9c73..46e33ee 100644
--- a/drivers/block/nvme.c
+++ b/drivers/block/nvme.c
@@ -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)
OpenPOWER on IntegriCloud