diff options
| author | Jens Axboe <axboe@kernel.dk> | 2019-02-13 15:32:30 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2019-02-13 15:32:30 +0100 |
| commit | ace74f73c200df4254788210ac70e00a7aeca4b8 (patch) | |
| tree | 840b990396c0556d65d44a2bf8fef5998b0a5dbf /drivers | |
| parent | Merge branch 'md-fixes' of https://github.com/liu-song-6/linux into for-linus (diff) | |
| parent | nvme-pci: add missing unlock for reset error (diff) | |
| download | linux-ace74f73c200df4254788210ac70e00a7aeca4b8.tar.xz linux-ace74f73c200df4254788210ac70e00a7aeca4b8.zip | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/nvme/host/pci.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 022ea1ee63f8..7fee665ec45e 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); } |