From 8449a198ce54e1ff40e916da6ac990cd13092614 Mon Sep 17 00:00:00 2001 From: Matthew Wilcox Date: Tue, 1 Feb 2011 08:39:04 -0500 Subject: [PATCH] --- yaml --- r: 286235 b: refs/heads/master c: 3f85d50b609e8a5ef151656210203a6e94c19538 h: refs/heads/master i: 286233: 5d831ad1fcf56d664580de7ca7eef879ed91448f 286231: 9329473155fac21342c6d1b5a14a1d556d855365 v: v3 --- [refs] | 2 +- trunk/drivers/block/nvme.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ac0a3a2c107d..074a3fdd8aeb 100644 --- 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 index 9377cf32f813..dc821776be94 100644 --- 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;