NVMe: Check returns from nvme_alloc_queue()

[linux-2.6-block.git] / drivers / block / nvme.c

diff --git a/drivers/block/nvme.c b/drivers/block/nvme.c
index 40fb2e1bdfe4c820028e853870312a86d84d4c5d..dc821776be949d8b2b298ce265bc413c14133c54 100644 (file)
--- a/drivers/block/nvme.c
+++ b/drivers/block/nvme.c
@@ -48,7 +48,6 @@ module_param(nvme_major, int, 0);
  * Represents an NVM Express device.  Each nvme_dev is a PCI function.
  */
 struct nvme_dev {
-       struct list_head node;
        struct nvme_queue **queues;
        u32 __iomem *dbs;
        struct pci_dev *pci_dev;
@@ -58,6 +57,9 @@ struct nvme_dev {
        struct msix_entry *entry;
        struct nvme_bar __iomem *bar;
        struct list_head namespaces;
+       char serial[20];
+       char model[40];
+       char firmware_rev[8];
 };
 
 /*
@@ -617,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;
@@ -653,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;
@@ -979,6 +986,7 @@ static int __devinit nvme_dev_add(struct nvme_dev *dev)
 {
        int res, nn, i;
        struct nvme_ns *ns, *next;
+       struct nvme_id_ctrl *ctrl;
        void *id;
        dma_addr_t dma_addr;
        struct nvme_command cid, crt;
@@ -1003,7 +1011,11 @@ static int __devinit nvme_dev_add(struct nvme_dev *dev)
                goto out_free;
        }
 
-       nn = le32_to_cpup(&((struct nvme_id_ctrl *)id)->nn);
+       ctrl = id;
+       nn = le32_to_cpup(&ctrl->nn);
+       memcpy(dev->serial, ctrl->sn, sizeof(ctrl->sn));
+       memcpy(dev->model, ctrl->mn, sizeof(ctrl->mn));
+       memcpy(dev->firmware_rev, ctrl->fr, sizeof(ctrl->fr));
 
        cid.identify.cns = 0;
        memset(&crt, 0, sizeof(crt));