diff options
| author |   Dave Airlie <airlied@redhat.com> | 2018-07-04 10:27:12 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-07-04 10:27:12 +1000 |
| commit | f29135ee4e0d4e01911ed569f731bfdb841cea6d (patch) | |
| tree | e72d49a2f677dd069c3a673522cf785548148f71 /drivers/staging/android | |
| parent | Merge tag 'drm-misc-next-2018-06-27' of git://anongit.freedesktop.org/drm/drm-misc into drm-next (diff) | |
| parent | Linux 4.18-rc3 (diff) | |
| download | linux-dev-f29135ee4e0d4e01911ed569f731bfdb841cea6d.tar.xz linux-dev-f29135ee4e0d4e01911ed569f731bfdb841cea6d.zip | |
Merge v4.18-rc3 into drm-next
Two requests have come in for a backmerge,
and I've got some pull reqs on rc2, so this
just makes sense.
Signed-off-by: Dave Airlie <airlied@redhat.com>
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; |