diff options
| author | Israel Rukshin <israelr@mellanox.com> | 2020-03-24 16:29:40 +0100 |
|---|---|---|
| committer | Keith Busch <kbusch@kernel.org> | 2020-03-25 20:51:55 +0100 |
| commit | 253fd4ac806896293c9b9d12c794195447bad164 (patch) | |
| tree | cc0a341b4f0e2772c93805ce98c95239dcb642be /drivers/nvme/host | |
| parent | nvme: Remove unused return code from nvme_delete_ctrl_sync (diff) | |
| download | linux-253fd4ac806896293c9b9d12c794195447bad164.tar.xz linux-253fd4ac806896293c9b9d12c794195447bad164.zip | |
nvme-pci: Re-order nvme_pci_free_ctrl
Destroy the resources in the same order like in nvme_probe error flow to
improve code readability.
Signed-off-by: Israel Rukshin <israelr@mellanox.com>
Reviewed-by: Max Gurtovoy <maxg@mellanox.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Keith Busch <kbusch@kernel.org>
Diffstat (limited to 'drivers/nvme/host')
| -rw-r--r-- | drivers/nvme/host/pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index e6fa0c7bb96c..ff0bd2d84f3e 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -2470,13 +2470,13 @@ static void nvme_pci_free_ctrl(struct nvme_ctrl *ctrl) struct nvme_dev *dev = to_nvme_dev(ctrl); nvme_dbbuf_dma_free(dev); - put_device(dev->dev); nvme_free_tagset(dev); if (dev->ctrl.admin_q) blk_put_queue(dev->ctrl.admin_q); - kfree(dev->queues); free_opal_dev(dev->ctrl.opal_dev); mempool_destroy(dev->iod_mempool); + put_device(dev->dev); + kfree(dev->queues); kfree(dev); } |