Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-24 11:51:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

NVMe: Merge issue on character device bring-up

Browse Source 
A recent patch made it possible to bring up the character handle when the
device is responsive but not accepting a set-features command. Another
recent patch moved the initialization that requires we move where the
checks for this condition occur. This patch merges these two ideas so
it works much as before.

Signed-off-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
This commit is contained in:
Keith Busch 2013-09-05 14:45:07 -06:00 committed by Matthew Wilcox
parent 9d713c2bfb
commit d82e8bfdef
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/block/nvme-core.c
View File

@ -2135,10 +2135,10 @@ static int nvme_dev_start(struct nvme_dev *dev)
spin_unlock(&dev_list_lock); spin_unlock(&dev_list_lock);
result = nvme_setup_io_queues(dev); result = nvme_setup_io_queues(dev);
if (result) if (result && result != -EBUSY)
goto disable; goto disable;
return 0; return result;
disable: disable:
spin_lock(&dev_list_lock); spin_lock(&dev_list_lock);
@ -2177,13 +2177,17 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id)
goto release; goto release;
result = nvme_dev_start(dev); result = nvme_dev_start(dev);
if (result) if (result) {
if (result == -EBUSY)
goto create_cdev;
goto release_pools; goto release_pools;
}
result = nvme_dev_add(dev); result = nvme_dev_add(dev);
if (result && result != -EBUSY) if (result)
goto shutdown; goto shutdown;
create_cdev:
scnprintf(dev->name, sizeof(dev->name), "nvme%d", dev->instance); scnprintf(dev->name, sizeof(dev->name), "nvme%d", dev->instance);
dev->miscdev.minor = MISC_DYNAMIC_MINOR; dev->miscdev.minor = MISC_DYNAMIC_MINOR;
dev->miscdev.parent = &pdev->dev; dev->miscdev.parent = &pdev->dev;