---

yaml --- r: 334823 b: refs/heads/master c: ba4d93b h: refs/heads/master i: 334821: d4fcfb9 334819: 2c64d12 334815: d9e8f5d v: v3
git-mirror · Oct 23, 2012 · be8927b · be8927b
1 parent e79d501
commit be8927b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 446c82fc44da5ae24a205d7130571614dc6969d3
+refs/heads/master: ba4d93bc9ea4510a145161f0af3537b4f380af01
diff --git a/trunk/drivers/base/dma-coherent.c b/trunk/drivers/base/dma-coherent.c
@@ -191,9 +191,8 @@ EXPORT_SYMBOL(dma_release_from_coherent);
  * This checks whether the memory was allocated from the per-device
  * coherent memory pool and if so, maps that memory to the provided vma.
  *
- * Returns 1 if we correctly mapped the memory, or 0 if
- * dma_release_coherent() should proceed with mapping memory from
- * generic pools.
+ * Returns 1 if we correctly mapped the memory, or 0 if the caller should
+ * proceed with mapping memory from generic pools.
  */
 int dma_mmap_from_coherent(struct device *dev, struct vm_area_struct *vma,
 			   void *vaddr, size_t size, int *ret)