|
@@ -2263,15 +2263,15 @@ static void nvme_reset_work(struct work_struct *work)
|
|
|
mutex_lock(&dev->shutdown_lock);
|
|
mutex_lock(&dev->shutdown_lock);
|
|
|
result = nvme_pci_enable(dev);
|
|
result = nvme_pci_enable(dev);
|
|
|
if (result)
|
|
if (result)
|
|
|
- goto out;
|
|
|
|
|
|
|
+ goto out_unlock;
|
|
|
|
|
|
|
|
result = nvme_pci_configure_admin_queue(dev);
|
|
result = nvme_pci_configure_admin_queue(dev);
|
|
|
if (result)
|
|
if (result)
|
|
|
- goto out;
|
|
|
|
|
|
|
+ goto out_unlock;
|
|
|
|
|
|
|
|
result = nvme_alloc_admin_tags(dev);
|
|
result = nvme_alloc_admin_tags(dev);
|
|
|
if (result)
|
|
if (result)
|
|
|
- goto out;
|
|
|
|
|
|
|
+ goto out_unlock;
|
|
|
|
|
|
|
|
/*
|
|
/*
|
|
|
* Limit the max command size to prevent iod->sg allocations going
|
|
* Limit the max command size to prevent iod->sg allocations going
|
|
@@ -2354,6 +2354,8 @@ static void nvme_reset_work(struct work_struct *work)
|
|
|
nvme_start_ctrl(&dev->ctrl);
|
|
nvme_start_ctrl(&dev->ctrl);
|
|
|
return;
|
|
return;
|
|
|
|
|
|
|
|
|
|
+ out_unlock:
|
|
|
|
|
+ mutex_unlock(&dev->shutdown_lock);
|
|
|
out:
|
|
out:
|
|
|
nvme_remove_dead_ctrl(dev, result);
|
|
nvme_remove_dead_ctrl(dev, result);
|
|
|
}
|
|
}
|