aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSusobhan Dey <susobhan.dey@gmail.com>2018-09-25 12:29:15 -0700
committerChristoph Hellwig <hch@lst.de>2018-09-25 16:21:40 -0700
commitbb830add192e9d8338082c0fc2c209e23b43d865 (patch)
treea5a7343ba3cc588651752274cabb34b1ea84c4f1
parentbe1277f5eb17a2e5788139eabb0b53dd04c695f3 (diff)
downloadlinux-stericsson-bb830add192e9d8338082c0fc2c209e23b43d865.tar.gz
nvme: properly propagate errors in nvme_mpath_init
Signed-off-by: Susobhan Dey <susobhan.dey@gmail.com> Signed-off-by: Christoph Hellwig <hch@lst.de>
-rw-r--r--drivers/nvme/host/multipath.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
index 5a9562881d4e..9fe3fff818b8 100644
--- a/drivers/nvme/host/multipath.c
+++ b/drivers/nvme/host/multipath.c
@@ -537,8 +537,10 @@ int nvme_mpath_init(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id)
INIT_WORK(&ctrl->ana_work, nvme_ana_work);
ctrl->ana_log_buf = kmalloc(ctrl->ana_log_size, GFP_KERNEL);
- if (!ctrl->ana_log_buf)
+ if (!ctrl->ana_log_buf) {
+ error = -ENOMEM;
goto out;
+ }
error = nvme_read_ana_log(ctrl, true);
if (error)
@@ -547,7 +549,7 @@ int nvme_mpath_init(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id)
out_free_ana_log_buf:
kfree(ctrl->ana_log_buf);
out:
- return -ENOMEM;
+ return error;
}
void nvme_mpath_uninit(struct nvme_ctrl *ctrl)