diff options
| author | Greg Kroah-Hartman | 2018-07-02 08:21:54 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2018-07-02 08:21:54 +0200 |
| commit | 7f5d8f711687fb6ad39ece9dd8e76dc6b196ac5c (patch) | |
| tree | f11fd2349981d5c86cfcaf11029946d18cdcb5f7 /drivers/staging/android | |
| parent | staging: rtl8188eu: remove whitespace - coding style (diff) | |
| parent | Linux 4.18-rc3 (diff) | |
| download | kernel-qcow2-linux-7f5d8f711687fb6ad39ece9dd8e76dc6b196ac5c.tar.gz kernel-qcow2-linux-7f5d8f711687fb6ad39ece9dd8e76dc6b196ac5c.tar.xz kernel-qcow2-linux-7f5d8f711687fb6ad39ece9dd8e76dc6b196ac5c.zip | |
Merge 4.18-rc3 into staging-next
We want the staging/iio fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/android')
| -rw-r--r-- | drivers/staging/android/ion/ion_heap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/android/ion/ion_heap.c b/drivers/staging/android/ion/ion_heap.c index e8c440329708..31db510018a9 100644 --- a/drivers/staging/android/ion/ion_heap.c +++ b/drivers/staging/android/ion/ion_heap.c @@ -30,7 +30,7 @@ void *ion_heap_map_kernel(struct ion_heap *heap, struct page **tmp = pages; if (!pages) - return NULL; + return ERR_PTR(-ENOMEM); if (buffer->flags & ION_FLAG_CACHED) pgprot = PAGE_KERNEL; |