From be8927b756e00e86733a8d0804fa9ce04c886d11 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Thu, 18 Oct 2012 09:29:44 +0200 Subject: [PATCH] --- yaml --- r: 334823 b: refs/heads/master c: ba4d93bc9ea4510a145161f0af3537b4f380af01 h: refs/heads/master i: 334821: d4fcfb91a090ece4c464f56433b54bf79e48e8b9 334819: 2c64d12993a281b7a8c861fab4e1d2c47d03af8b 334815: d9e8f5d43f1755aa1e8820abd1e09b6cb72e7bd6 v: v3 --- [refs] | 2 +- trunk/drivers/base/dma-coherent.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c9205a3d0980..e7edc0d391e0 100644 --- 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 index 560a7173f810..bc256b641027 100644 --- 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)