diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 950289405ef283118e369d4fb9242a4f2be6e55e..218506e3dabea4cbf3c9176eac0fd2758648e557 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -2003,6 +2003,7 @@ static void nvme_map_cmb(struct nvme_dev *dev)
 	if (pci_p2pdma_add_resource(pdev, bar, size, offset)) {
 		dev_warn(dev->ctrl.device,
 			 "failed to register the CMB\n");
+		hi_lo_writeq(0, dev->bar + NVME_REG_CMBMSC);
 		return;
 	}