diff options
| author | Jens Axboe | 2018-02-28 20:18:58 +0100 |
|---|---|---|
| committer | Jens Axboe | 2018-02-28 20:18:58 +0100 |
| commit | 468f098734ab095b72d8af26bcd4bcb2ed31a3be (patch) | |
| tree | 657b08428562785483129b470c8017b70c38c1aa /drivers/nvme/host/pci.c | |
| parent | nbd: fix return value in error handling path (diff) | |
| parent | nvmet: fix PSDT field check in command format (diff) | |
| download | kernel-qcow2-linux-468f098734ab095b72d8af26bcd4bcb2ed31a3be.tar.gz kernel-qcow2-linux-468f098734ab095b72d8af26bcd4bcb2ed31a3be.tar.xz kernel-qcow2-linux-468f098734ab095b72d8af26bcd4bcb2ed31a3be.zip | |
Merge branch 'for-jens' of git://git.infradead.org/nvme into for-linus
Pull NVMe fixes from Keith for 4.16-rc.
* 'for-jens' of git://git.infradead.org/nvme:
nvmet: fix PSDT field check in command format
nvme-multipath: fix sysfs dangerously created links
nvme-pci: Fix nvme queue cleanup if IRQ setup fails
nvmet-loop: use blk_rq_payload_bytes for sgl selection
nvme-rdma: use blk_rq_payload_bytes instead of blk_rq_bytes
nvme-fabrics: don't check for non-NULL module in nvmf_register_transport
Diffstat (limited to 'drivers/nvme/host/pci.c')
| -rw-r--r-- | drivers/nvme/host/pci.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 73036d2fbbd5..5933a5c732e8 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -1459,7 +1459,7 @@ static int nvme_create_queue(struct nvme_queue *nvmeq, int qid) nvmeq->cq_vector = qid - 1; result = adapter_alloc_cq(dev, qid, nvmeq); if (result < 0) - return result; + goto release_vector; result = adapter_alloc_sq(dev, qid, nvmeq); if (result < 0) @@ -1473,9 +1473,12 @@ static int nvme_create_queue(struct nvme_queue *nvmeq, int qid) return result; release_sq: + dev->online_queues--; adapter_delete_sq(dev, qid); release_cq: adapter_delete_cq(dev, qid); + release_vector: + nvmeq->cq_vector = -1; return result; } |