提交 ce4541f4 编写于 作者: C Christoph Hellwig 提交者: Jens Axboe

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: NChristoph Hellwig <hch@lst.de>
Signed-off-by: NKeith Busch <keith.busch@intel.com>
Signed-off-by: NJens Axboe <axboe@fb.com>
上级 7fd8930f
...@@ -1930,12 +1930,6 @@ static void nvme_dev_scan(struct work_struct *work) ...@@ -1930,12 +1930,6 @@ static void nvme_dev_scan(struct work_struct *work)
*/ */
static int nvme_dev_add(struct nvme_dev *dev) 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) { if (!dev->tagset.tags) {
dev->tagset.ops = &nvme_mq_ops; dev->tagset.ops = &nvme_mq_ops;
dev->tagset.nr_hw_queues = dev->online_queues - 1; dev->tagset.nr_hw_queues = dev->online_queues - 1;
...@@ -2431,6 +2425,10 @@ static void nvme_probe_work(struct work_struct *work) ...@@ -2431,6 +2425,10 @@ static void nvme_probe_work(struct work_struct *work)
if (result) if (result)
goto disable; goto disable;
result = nvme_init_identify(&dev->ctrl);
if (result)
goto free_tags;
result = nvme_setup_io_queues(dev); result = nvme_setup_io_queues(dev);
if (result) if (result)
goto free_tags; goto free_tags;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册