X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=drivers%2Fblock%2Fnvme.c;h=dc821776be949d8b2b298ce265bc413c14133c54;hb=3f85d50b609e8a5ef151656210203a6e94c19538;hp=9377cf32f8131e1a1a1fa2030efb95959ecfe463;hpb=8e9f0e71150bf6277d0ea40bc8feb1338ddf13fd;p=linux-2.6-block.git

diff --git a/drivers/block/nvme.c b/drivers/block/nvme.c
index 9377cf32f813..dc821776be94 100644
--- a/drivers/block/nvme.c
+++ b/drivers/block/nvme.c
@@ -619,6 +619,9 @@ static __devinit struct nvme_queue *nvme_create_queue(struct nvme_dev *dev,
 	int result;
 	struct nvme_queue *nvmeq = nvme_alloc_queue(dev, qid, cq_size, vector);
 
+	if (!nvmeq)
+		return NULL;
+
 	result = adapter_alloc_cq(dev, qid, nvmeq);
 	if (result < 0)
 		goto free_nvmeq;
@@ -655,6 +658,8 @@ static int __devinit nvme_configure_admin_queue(struct nvme_dev *dev)
 	dev->dbs = ((void __iomem *)dev->bar) + 4096;
 
 	nvmeq = nvme_alloc_queue(dev, 0, 64, 0);
+	if (!nvmeq)
+		return -ENOMEM;
 
 	aqa = nvmeq->q_depth - 1;
 	aqa |= aqa << 16;