Merge "staging: ion: Return correct type from map_kernel"

drivers/staging/android/ion/ion_heap.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,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;