Merge tag 'for-linus-2019-08-17' of git://git.kernel.dk/linux-block

[sfrench/cifs-2.6.git] / drivers / nvme / host / pci.c

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 108e109e99f1aceddce3c535c3e25079752204bf..6bd9b10339654b3d11aa3944f7a51ee264ffb8a2 100644 (file)
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -2695,7 +2695,7 @@ static void nvme_async_probe(void *data, async_cookie_t cookie)
 {
        struct nvme_dev *dev = data;
 
 {
        struct nvme_dev *dev = data;
 

-       nvme_reset_ctrl_sync(&dev->ctrl);
+       flush_work(&dev->ctrl.reset_work);

        flush_work(&dev->ctrl.scan_work);
        nvme_put_ctrl(&dev->ctrl);
 }
        flush_work(&dev->ctrl.scan_work);
        nvme_put_ctrl(&dev->ctrl);
 }


@@ -2761,6 +2761,7 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
        dev_info(dev->ctrl.device, "pci function %s\n", dev_name(&pdev->dev));
 
 
        dev_info(dev->ctrl.device, "pci function %s\n", dev_name(&pdev->dev));
 

+       nvme_reset_ctrl(&dev->ctrl);

        nvme_get_ctrl(&dev->ctrl);
        async_schedule(nvme_async_probe, dev);
 
        nvme_get_ctrl(&dev->ctrl);
        async_schedule(nvme_async_probe, dev);