Skip to content

Commit ed56537

Browse files
committed
Merge branch 'nvme-4.15' of git://git.infradead.org/nvme into for-linus
Pull NVMe fixes from Christoph: "A few more nvme updates for 4.15. A single small PCIe fix, and a number of patches for RDMA that are a little larger than what I'd like to see for -rc2, but they fix important issues seen in the wild."
2 parents 2967acb + 7e5dd57 commit ed56537

File tree

2 files changed

+119
-116
lines changed

2 files changed

+119
-116
lines changed

drivers/nvme/host/pci.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1759,6 +1759,7 @@ static void nvme_free_host_mem(struct nvme_dev *dev)
17591759
dev->nr_host_mem_descs * sizeof(*dev->host_mem_descs),
17601760
dev->host_mem_descs, dev->host_mem_descs_dma);
17611761
dev->host_mem_descs = NULL;
1762+
dev->nr_host_mem_descs = 0;
17621763
}
17631764

17641765
static int __nvme_alloc_host_mem(struct nvme_dev *dev, u64 preferred,

0 commit comments

Comments
 (0)