Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ace74f73 authored by Jens Axboe's avatar Jens Axboe
Browse files

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

Pull single NVMe fix from Christoph

* 'nvme-5.0' of git://git.infradead.org/nvme:
  nvme-pci: add missing unlock for reset error
parents 69306fe1 4726bcf3

drivers/nvme/host/pci.c

+5 −3
Original line number Diff line number Diff line
@@ -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);

}