diff options
| author | Christoph Hellwig <hch@lst.de> | 2015-10-16 07:58:46 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-12-01 10:59:40 -0700 |
| commit | ce4541f40a949cd9a9c9f308b1a6a86914ce6e1a (patch) | |
| tree | 3fe76ebab4c4ae2c21a67b5df205b6bc3d022ea5 /drivers/nvme | |
| parent | 7fd8930f26be4c9078684b2fef14da0503771bf2 (diff) | |
| download | linux-stable-ce4541f40a949cd9a9c9f308b1a6a86914ce6e1a.tar.gz linux-stable-ce4541f40a949cd9a9c9f308b1a6a86914ce6e1a.tar.bz2 linux-stable-ce4541f40a949cd9a9c9f308b1a6a86914ce6e1a.zip | |
nvme: move the call to nvme_init_identify earlier
We want to record the identify and CAP values even if no I/O queue
is available.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/nvme')
| -rw-r--r-- | drivers/nvme/host/pci.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 086563fe6ed1..4d64aee61aea 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -1930,12 +1930,6 @@ static void nvme_dev_scan(struct work_struct *work) */ static int nvme_dev_add(struct nvme_dev *dev) { - int res; - - res = nvme_init_identify(&dev->ctrl); - if (res) - return res; - if (!dev->tagset.tags) { dev->tagset.ops = &nvme_mq_ops; dev->tagset.nr_hw_queues = dev->online_queues - 1; @@ -2431,6 +2425,10 @@ static void nvme_probe_work(struct work_struct *work) if (result) goto disable; + result = nvme_init_identify(&dev->ctrl); + if (result) + goto free_tags; + result = nvme_setup_io_queues(dev); if (result) goto free_tags; |