From: Axel Lin <axel.lin@ingics.com>
Date: Sun, 28 Jun 2015 09:00:57 +0000 (+0800)
Subject: nvdimm: Fix return value of nvdimm_bus_init() if class_create() fails
X-Git-Tag: v4.1.12-92~18^2^2~165
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=bd6ef84bbfdd32efde8b5ace8e63f7eb1823eacd;p=users%2Fjedix%2Flinux-maple.git

nvdimm: Fix return value of nvdimm_bus_init() if class_create() fails

Orabug: 22913653

Return proper error if class_create() fails.

Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
(cherry picked from commit daa1dee405d7d3d3e816b84a692e838a5647a02a)
Signed-off-by: Dan Duval <dan.duval@oracle.com>
---

diff --git a/drivers/nvdimm/bus.c b/drivers/nvdimm/bus.c
index 73442bd824a74..7e2c43f701bc4 100644
--- a/drivers/nvdimm/bus.c
+++ b/drivers/nvdimm/bus.c
@@ -699,8 +699,10 @@ int __init nvdimm_bus_init(void)
 	nvdimm_major = rc;
 
 	nd_class = class_create(THIS_MODULE, "nd");
-	if (IS_ERR(nd_class))
+	if (IS_ERR(nd_class)) {
+		rc = PTR_ERR(nd_class);
 		goto err_class;
+	}
 
 	return 0;