diff options
| author | Colin Cross <ccross@android.com> | 2013-12-13 14:24:48 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-14 08:57:17 -0800 |
| commit | dfc4a9b1769095d8125a56e5515f6728c9f137c0 (patch) | |
| tree | e079be0fa0eca1439b790308c16acc207f940a65 /drivers/staging/android/ion/ion_heap.c | |
| parent | 2540c73a5bf068b8c1c092fc3ce63c62ba949371 (diff) | |
ion: convert map_kernel to return ERR_PTR
ion is going to stop accepting NULL as an error value, use ERR_PTR.
Signed-off-by: Colin Cross <ccross@android.com>
[jstultz: modified patch to apply to staging directory]
Signed-off-by: John Stultz <john.stultz@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/android/ion/ion_heap.c')
| -rw-r--r-- | drivers/staging/android/ion/ion_heap.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/staging/android/ion/ion_heap.c b/drivers/staging/android/ion/ion_heap.c index cc2a42547605..a584ec036862 100644 --- 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; } |