diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index e958c0ace76f..385a38c75367 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -1569,6 +1569,13 @@ static int nvme_ns_info_from_identify(struct nvme_ctrl *ctrl,
 	struct nvme_id_ns *id;
 	int ret;
 
+	printk("%s called\n", __func__);
+
+	ret = nvme_identify_ns(ctrl, info->nsid, &id);
+	if (ret)
+		return ret;
+
+	kfree(id);
 	ret = nvme_identify_ns(ctrl, info->nsid, &id);
 	if (ret)
 		return ret;
@@ -1612,6 +1619,8 @@ static int nvme_ns_info_from_id_cs_indep(struct nvme_ctrl *ctrl,
 	};
 	int ret;
 
+	printk("%s called\n", __func__);
+
 	id = kmalloc(sizeof(*id), GFP_KERNEL);
 	if (!id)
 		return -ENOMEM;
@@ -4012,7 +4021,7 @@ static int nvme_scan_ns_list(struct nvme_ctrl *ctrl)
 
 			if (!nsid)	/* end of the list? */
 				goto out;
-			printk("nvme_scan_ns_list: scanning nsid %u for %i of %i", nsid, i, nr_entries);
+			dev_warn(ctrl->device, "nvme_scan_ns_list: scanning nsid %u for %i of %i", nsid, i, nr_entries);
 			nvme_scan_ns(ctrl, nsid);
 			while (++prev < nsid)
 				nvme_ns_remove_by_nsid(ctrl, prev);
@@ -4072,6 +4081,8 @@ static void nvme_scan_work(struct work_struct *work)
 		container_of(work, struct nvme_ctrl, scan_work);
 	int ret;
 
+	printk("%s called\n", __func__);
+
 	/* No tagset on a live ctrl means IO queues could not created */
 	if (nvme_ctrl_state(ctrl) != NVME_CTRL_LIVE || !ctrl->tagset)
 		return;