Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 286319
b: refs/heads/master
c: fe304c4
h: refs/heads/master
i:
  286317: c0438a7
  286315: 0f5bd1e
  286311: cdab126
  286303: a5dab53
v: v3
  • Loading branch information
Matthew Wilcox committed Jan 10, 2012
1 parent 30e3e3d commit 23123be
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 497421880acecd0281d3182d534f3d28c927caec
refs/heads/master: fe304c43c6d63e29ed4fc46a874d7a74313788c5
1 change: 1 addition & 0 deletions trunk/drivers/block/nvme.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 23123be

Please sign in to comment.