p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Jens Axboe 2019-02-13 07:32:30 -07:00
parent 69306fe17a 4726bcf30f
commit ace74f73c2
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/nvme/host/pci.c
View File

@ -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);
}