aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/block/nvme-core.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
index cf9b8a8a24d3..2cc2cee7a367 100644
--- a/drivers/block/nvme-core.c
+++ b/drivers/block/nvme-core.c
@@ -875,8 +875,8 @@ static int __nvme_submit_admin_cmd(struct nvme_dev *dev, struct nvme_command *cm
875 struct request *req; 875 struct request *req;
876 876
877 req = blk_mq_alloc_request(dev->admin_q, WRITE, GFP_KERNEL, false); 877 req = blk_mq_alloc_request(dev->admin_q, WRITE, GFP_KERNEL, false);
878 if (!req) 878 if (IS_ERR(req))
879 return -ENOMEM; 879 return PTR_ERR(req);
880 res = nvme_submit_sync_cmd(req, cmd, result, timeout); 880 res = nvme_submit_sync_cmd(req, cmd, result, timeout);
881 blk_mq_free_request(req); 881 blk_mq_free_request(req);
882 return res; 882 return res;
@@ -896,8 +896,8 @@ int nvme_submit_io_cmd(struct nvme_dev *dev, struct nvme_ns *ns,
896 896
897 req = blk_mq_alloc_request(ns->queue, WRITE, (GFP_KERNEL|__GFP_WAIT), 897 req = blk_mq_alloc_request(ns->queue, WRITE, (GFP_KERNEL|__GFP_WAIT),
898 false); 898 false);
899 if (!req) 899 if (IS_ERR(req))
900 return -ENOMEM; 900 return PTR_ERR(req);
901 res = nvme_submit_sync_cmd(req, cmd, result, NVME_IO_TIMEOUT); 901 res = nvme_submit_sync_cmd(req, cmd, result, NVME_IO_TIMEOUT);
902 blk_mq_free_request(req); 902 blk_mq_free_request(req);
903 return res; 903 return res;
@@ -1691,8 +1691,8 @@ static int nvme_user_cmd(struct nvme_dev *dev, struct nvme_ns *ns,
1691 1691
1692 req = blk_mq_alloc_request(ns->queue, WRITE, 1692 req = blk_mq_alloc_request(ns->queue, WRITE,
1693 (GFP_KERNEL|__GFP_WAIT), false); 1693 (GFP_KERNEL|__GFP_WAIT), false);
1694 if (!req) 1694 if (IS_ERR(req))
1695 status = -ENOMEM; 1695 status = PTR_ERR(req);
1696 else { 1696 else {
1697 status = nvme_submit_sync_cmd(req, &c, &cmd.result, 1697 status = nvme_submit_sync_cmd(req, &c, &cmd.result,
1698 timeout); 1698 timeout);