From: Keith Busch <keith.busch@intel.com>
Date: Mon, 26 Nov 2018 23:39:47 +0000 (-0700)
Subject: nvme: Free ctrl device name on init failure
X-Git-Tag: v5.4-rc1~2047^2~9^2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d6a2b9535d1e52bea269c138614c4801469d10e1;p=platform%2Fkernel%2Flinux-rpi.git

nvme: Free ctrl device name on init failure

Free the kobject name that was allocated for the controller device on
failure rather than its parent.

Fixes: d22524a4782a9 ("nvme: switch controller refcounting to use struct device")
Signed-off-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 559d567..5afda6f 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -3585,7 +3585,7 @@ int nvme_init_ctrl(struct nvme_ctrl *ctrl, struct device *dev,
 
 	return 0;
 out_free_name:
-	kfree_const(dev->kobj.name);
+	kfree_const(ctrl->device->kobj.name);
 out_release_instance:
 	ida_simple_remove(&nvme_instance_ida, ctrl->instance);
 out: