From d37aa151f874563a35d49a0ff0a129ef332c5e9e Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 21 Aug 2013 12:50:37 -0700 Subject: 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 --- drivers/gpu/ion/ion_heap.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'drivers/gpu/ion/ion_heap.c') 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; } -- cgit v1.2.3-70-g09d2