diff options
| author | Jens Axboe <axboe@kernel.dk> | 2017-11-29 09:21:50 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2017-11-29 09:21:50 -0700 |
| commit | ed565371e368f014db237aacf42b27b40b1bd247 (patch) | |
| tree | 3d950c90e216b27175ccfb193002c798af4f5fc2 /drivers/nvme/host/pci.c | |
| parent | 2967acbb257a6a9bf912f4778b727e00972eac9b (diff) | |
| parent | 7e5dd57ef3081ff6c03908d786ed5087f6fbb7ae (diff) | |
| download | linux-ed565371e368f014db237aacf42b27b40b1bd247.tar.bz2 | |
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."
Diffstat (limited to 'drivers/nvme/host/pci.c')
| -rw-r--r-- | drivers/nvme/host/pci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 617374762b7c..f5800c3c9082 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -1759,6 +1759,7 @@ static void nvme_free_host_mem(struct nvme_dev *dev) dev->nr_host_mem_descs * sizeof(*dev->host_mem_descs), dev->host_mem_descs, dev->host_mem_descs_dma); dev->host_mem_descs = NULL; + dev->nr_host_mem_descs = 0; } static int __nvme_alloc_host_mem(struct nvme_dev *dev, u64 preferred, |