nvme-pci: fix a NULL pointer dereference in nvme_alloc_admin_tags

[platform/kernel/linux-rpi.git] / drivers / nvme / host / pci.c

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index e6f55cf..3ddd24a 100644 (file)
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -1680,6 +1680,7 @@ static int nvme_alloc_admin_tags(struct nvme_dev *dev)
                dev->ctrl.admin_q = blk_mq_init_queue(&dev->admin_tagset);
                if (IS_ERR(dev->ctrl.admin_q)) {
                        blk_mq_free_tag_set(&dev->admin_tagset);
+                       dev->ctrl.admin_q = NULL;
                        return -ENOMEM;
                }
                if (!blk_get_queue(dev->ctrl.admin_q)) {