diff options
| author | Colin Cross <ccross@android.com> | 2013-08-21 12:50:37 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2013-09-19 23:03:31 -0500 |
| commit | d37aa151f874563a35d49a0ff0a129ef332c5e9e (patch) | |
| tree | 25872e1a220d4f12ab816b52ffa711b7b772c64f /drivers | |
| parent | a3041cac9fc117df010e66ce40091fa2c4f646f8 (diff) | |
| download | olio-linux-3.10-d37aa151f874563a35d49a0ff0a129ef332c5e9e.tar.xz olio-linux-3.10-d37aa151f874563a35d49a0ff0a129ef332c5e9e.zip | |
ion: convert map_kernel to return ERR_PTR
ion is going to stop accepting NULL as an error value, use ERR_PTR.
Change-Id: I030e8b72138904e38a4a5d225beaaa98427651fb
Signed-off-by: Colin Cross <ccross@android.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/ion/ion_carveout_heap.c | 7 | ||||
| -rw-r--r-- | drivers/gpu/ion/ion_heap.c | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/drivers/gpu/ion/ion_carveout_heap.c b/drivers/gpu/ion/ion_carveout_heap.c index ce8d311968f..86f35545eaf 100644 --- a/drivers/gpu/ion/ion_carveout_heap.c +++ b/drivers/gpu/ion/ion_carveout_heap.c @@ -112,13 +112,18 @@ void ion_carveout_heap_unmap_dma(struct ion_heap *heap, void *ion_carveout_heap_map_kernel(struct ion_heap *heap, struct ion_buffer *buffer) { + void *ret; int mtype = MT_MEMORY_NONCACHED; if (buffer->flags & ION_FLAG_CACHED) mtype = MT_MEMORY; - return __arm_ioremap(buffer->priv_phys, buffer->size, + ret = __arm_ioremap(buffer->priv_phys, buffer->size, mtype); + if (ret == NULL) + return ERR_PTR(-ENOMEM); + + return ret; } void ion_carveout_heap_unmap_kernel(struct ion_heap *heap, diff --git a/drivers/gpu/ion/ion_heap.c b/drivers/gpu/ion/ion_heap.c index bf6a383bd98..786302de7ed 100644 --- a/drivers/gpu/ion/ion_heap.c +++ b/drivers/gpu/ion/ion_heap.c @@ -56,6 +56,9 @@ void *ion_heap_map_kernel(struct ion_heap *heap, vaddr = vmap(pages, npages, VM_MAP, pgprot); vfree(pages); + if (vaddr == NULL) + return ERR_PTR(-ENOMEM); + return vaddr; } |