ion: convert map_kernel to return ERR_PTR

[~andy/linux] / drivers / staging / android / ion / ion_heap.c

diff --git a/drivers/staging/android/ion/ion_heap.c b/drivers/staging/android/ion/ion_heap.c
index cc2a42547605d797df2ba8d7469253708ae2b457..a584ec0368624881c4d6fb7b816f8cce8b2037f2 100644 (file)
--- a/drivers/staging/android/ion/ion_heap.c
+++ b/drivers/staging/android/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;
 }