From: Wang Sheng-Hui <shhuiw@foxmail.com>
Date: Thu, 28 Apr 2016 08:19:31 +0000 (+0800)
Subject: NVMe: nvme_core_exit() should do cleanup in the reverse order as nvme_core_init does
X-Git-Tag: v4.1.12-102.0.20170601_1400~89
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=dca8d1403de7d177affabc2558c40ebe2b782878;p=users%2Fjedix%2Flinux-maple.git

NVMe: nvme_core_exit() should do cleanup in the reverse order as nvme_core_init does

nvme_core_init does:
    1) register_blkdev
    2) __register_chrdev
    3) class_create

nvme_core_exit should do cleanup in the reverse order.

Signed-off-by: Wang Sheng-Hui <shhuiw@foxmail.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>
(cherry picked from commit 23bd63ceea30878758c303baaf9f8e28f299c578)

Orabug: 25130845

Signed-off-by: Ashok Vairavan <ashok.vairavan@oracle.com>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
---

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 480062e02bde2..b6a5a91f515df 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1610,9 +1610,9 @@ int __init nvme_core_init(void)
 
 void nvme_core_exit(void)
 {
-	unregister_blkdev(nvme_major, "nvme");
 	class_destroy(nvme_class);
 	__unregister_chrdev(nvme_char_major, 0, NVME_MINORS, "nvme");
+	unregister_blkdev(nvme_major, "nvme");
 }
 
 MODULE_LICENSE("GPL");