diff --git a/[refs] b/[refs] index 8c24a8deda7d..a778b38c35ea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 497421880acecd0281d3182d534f3d28c927caec +refs/heads/master: fe304c43c6d63e29ed4fc46a874d7a74313788c5 diff --git a/trunk/drivers/block/nvme.c b/trunk/drivers/block/nvme.c index 3f8cae9dc960..71fc9030b4df 100644 --- a/trunk/drivers/block/nvme.c +++ b/trunk/drivers/block/nvme.c @@ -1045,6 +1045,7 @@ static struct nvme_iod *nvme_map_user_pages(struct nvme_dev *dev, int write, length -= (PAGE_SIZE - offset); offset = 0; } + sg_mark_end(&sg[i - 1]); err = -ENOMEM; nents = dma_map_sg(&dev->pci_dev->dev, sg, count,