NVMe: Merge issue on character device bring-up

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / block / nvme-core.c

diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
index 9f2b424..da52092 100644 (file)
--- a/drivers/block/nvme-core.c
+++ b/drivers/block/nvme-core.c
@@ -2135,10 +2135,10 @@ static int nvme_dev_start(struct nvme_dev *dev)
        spin_unlock(&dev_list_lock);
 
        result = nvme_setup_io_queues(dev);
-       if (result)
+       if (result && result != -EBUSY)
                goto disable;
 
-       return 0;
+       return result;
 
  disable:
        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;
 
        result = nvme_dev_start(dev);
-       if (result)
+       if (result) {
+               if (result == -EBUSY)
+                       goto create_cdev;
                goto release_pools;
+       }
 
        result = nvme_dev_add(dev);
-       if (result && result != -EBUSY)
+       if (result)
                goto shutdown;
 
+ create_cdev:
        scnprintf(dev->name, sizeof(dev->name), "nvme%d", dev->instance);
        dev->miscdev.minor = MISC_DYNAMIC_MINOR;
        dev->miscdev.parent = &pdev->dev;