|
@@ -1313,11 +1313,11 @@ static int nvme_create_queue(struct nvme_queue *nvmeq, int qid)
|
|
|
if (result < 0)
|
|
|
goto release_cq;
|
|
|
|
|
|
+ nvme_init_queue(nvmeq, qid);
|
|
|
result = queue_request_irq(nvmeq);
|
|
|
if (result < 0)
|
|
|
goto release_sq;
|
|
|
|
|
|
- nvme_init_queue(nvmeq, qid);
|
|
|
return result;
|
|
|
|
|
|
release_sq:
|
|
@@ -1464,6 +1464,7 @@ static int nvme_pci_configure_admin_queue(struct nvme_dev *dev)
|
|
|
return result;
|
|
|
|
|
|
nvmeq->cq_vector = 0;
|
|
|
+ nvme_init_queue(nvmeq, 0);
|
|
|
result = queue_request_irq(nvmeq);
|
|
|
if (result) {
|
|
|
nvmeq->cq_vector = -1;
|
|
@@ -2156,7 +2157,6 @@ static void nvme_reset_work(struct work_struct *work)
|
|
|
if (result)
|
|
|
goto out;
|
|
|
|
|
|
- nvme_init_queue(dev->queues[0], 0);
|
|
|
result = nvme_alloc_admin_tags(dev);
|
|
|
if (result)
|
|
|
goto out;
|