aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/dma-coherent.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/dma-coherent.c b/kernel/dma-coherent.c
index 89a554cfd936..56dff5cb0f29 100644
--- a/kernel/dma-coherent.c
+++ b/kernel/dma-coherent.c
@@ -105,8 +105,7 @@ int dma_alloc_from_coherent(struct device *dev, ssize_t size,
105 *dma_handle = mem->device_base + (page << PAGE_SHIFT); 105 *dma_handle = mem->device_base + (page << PAGE_SHIFT);
106 *ret = mem->virt_base + (page << PAGE_SHIFT); 106 *ret = mem->virt_base + (page << PAGE_SHIFT);
107 memset(*ret, 0, size); 107 memset(*ret, 0, size);
108 } 108 } else if (mem->flags & DMA_MEMORY_EXCLUSIVE)
109 if (mem->flags & DMA_MEMORY_EXCLUSIVE)
110 *ret = NULL; 109 *ret = NULL;
111 } 110 }
112 return (mem != NULL); 111 return (mem != NULL);