From fbe834326159dee088e583b1b8b25bee64e45e4b Mon Sep 17 00:00:00 2001 From: Keith Busch Date: Wed, 25 Jul 2012 16:05:18 -0600 Subject: [PATCH] --- yaml --- r: 323245 b: refs/heads/master c: 5c42ea1643a630060f9e71e06d3933d244970967 h: refs/heads/master i: 323243: f98b5b0f5e877a72fd62db22f58048f505a62ca3 v: v3 --- [refs] | 2 +- trunk/drivers/block/nvme.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) 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)