From: xerofoify@gmail.com (Nicholas Krause) Date: Tue, 12 May 2015 19:51:31 -0400 Subject: [PATCH] block:Change the function, nvme_alloc_queue to use -ENOMEM for when failing memory allocations Message-ID: <1431474691-30469-1-git-send-email-xerofoify@gmail.com> This changes the function,nvme_alloc_queue to use the kernel code, -ENOMEM for when failing to allocate the memory required for the nvme_queue structure pointer,nvme in order to correctly return to the caller the correct reason for this function's failing. Signed-off-by: Nicholas Krause --- drivers/block/nvme-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c index 85b8036..e2eac1e 100644 --- a/drivers/block/nvme-core.c +++ b/drivers/block/nvme-core.c @@ -1387,7 +1387,7 @@ static struct nvme_queue *nvme_alloc_queue(struct nvme_dev *dev, int qid, struct device *dmadev = &dev->pci_dev->dev; struct nvme_queue *nvmeq = kzalloc(sizeof(*nvmeq), GFP_KERNEL); if (!nvmeq) - return NULL; + return -ENOMEM; nvmeq->cqes = dma_zalloc_coherent(dmadev, CQ_SIZE(depth), &nvmeq->cq_dma_addr, GFP_KERNEL); -- 2.1.4