diff --git a/[refs] b/[refs]
index d477de94e685..b84fda6e5a28 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e9ef46369f5107e634a93b7fc4e62a1f53343197
+refs/heads/master: 5c42ea1643a630060f9e71e06d3933d244970967
diff --git a/trunk/drivers/block/nvme.c b/trunk/drivers/block/nvme.c
index 38b9c73f6706..46e33eec6298 100644
--- a/trunk/drivers/block/nvme.c
+++ b/trunk/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)