Pull single NVMe fix from Christoph * 'nvme-5.0' of git://git.infradead.org/nvme: nvme-pci: add missing unlock for reset error
Unified · Split
| @@ -2560,15 +2560,15 @@ static void nvme_reset_work(struct work_struct *work) · 2559 unmodified lines | ||
| 2560 | 2560 | mutex_lock(&dev->shutdown_lock); |
| 2561 | 2561 | result = nvme_pci_enable(dev); |
| 2562 | 2562 | if (result) |
| 2563 | − goto out; | |
| 2563 | + goto out_unlock; | |
| 2564 | 2564 | |
| 2565 | 2565 | result = nvme_pci_configure_admin_queue(dev); |
| 2566 | 2566 | if (result) |
| 2567 | − goto out; | |
| 2567 | + goto out_unlock; | |
| 2568 | 2568 | |
| 2569 | 2569 | result = nvme_alloc_admin_tags(dev); |
| 2570 | 2570 | if (result) |
| 2571 | − goto out; | |
| 2571 | + goto out_unlock; | |
| 2572 | 2572 | |
| 2573 | 2573 | /* |
| 2574 | 2574 | * Limit the max command size to prevent iod->sg allocations going |
| @@ -2651,6 +2651,8 @@ static void nvme_reset_work(struct work_struct *work) · 76 unmodified lines | ||
| 2651 | 2651 | nvme_start_ctrl(&dev->ctrl); |
| 2652 | 2652 | return; |
| 2653 | 2653 | |
| 2654 | + out_unlock: | |
| 2655 | + mutex_unlock(&dev->shutdown_lock); | |
| 2654 | 2656 | out: |
| 2655 | 2657 | nvme_remove_dead_ctrl(dev, result); |
| 2656 | 2658 | } |