Merge branch 'nvme-5.0' of git://git.infradead.org/nvme into for-linus

ace74f73 · Jens Axboe <[email protected]> · 2019-02-13 07:32:30 -07:00

Pull single NVMe fix from Christoph

* 'nvme-5.0' of git://git.infradead.org/nvme:
  nvme-pci: add missing unlock for reset error

Merge commit. Changes below are compared with the first parent: 69306fe1.

Changes

1 files changed · +5 −3

File	Status	Add	Del	Content
drivers/nvme/host/pci.c	modified	+5	−3	View file

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 022ea1e..7fee665 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -2560,15 +2560,15 @@ static void nvme_reset_work(struct work_struct *work)
 	mutex_lock(&dev->shutdown_lock);
 	result = nvme_pci_enable(dev);
 	if (result)
-		goto out;
+		goto out_unlock;
 
 	result = nvme_pci_configure_admin_queue(dev);
 	if (result)
-		goto out;
+		goto out_unlock;
 
 	result = nvme_alloc_admin_tags(dev);
 	if (result)
-		goto out;
+		goto out_unlock;
 
 	/*
 	 * Limit the max command size to prevent iod->sg allocations going
@@ -2651,6 +2651,8 @@ static void nvme_reset_work(struct work_struct *work)
 	nvme_start_ctrl(&dev->ctrl);
 	return;
 
+ out_unlock:
+	mutex_unlock(&dev->shutdown_lock);
  out:
 	nvme_remove_dead_ctrl(dev, result);
 }