---

yaml --- r: 286235 b: refs/heads/master c: 3f85d50 h: refs/heads/master i: 286233: 5d831ad 286231: 9329473 v: v3
git-mirror · Nov 4, 2011 · 8449a19 · 8449a19
1 parent e29df02
commit 8449a19
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e9f0e71150bf6277d0ea40bc8feb1338ddf13fd
+refs/heads/master: 3f85d50b609e8a5ef151656210203a6e94c19538
diff --git a/trunk/drivers/block/nvme.c b/trunk/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;