Commit aacd1783 authored by Jaewon Kim's avatar Jaewon Kim Committed by Greg Kroah-Hartman
Browse files

staging: android: ion: return -ENOMEM in ion_cma_heap allocation failure 



Initial Commit 349c9e13 ("gpu: ion: add CMA heap") returns -1 in allocation
failure. The returned value is passed up to userspace through ioctl. So user can
misunderstand error reason as -EPERM(1) rather than -ENOMEM(12).

This patch simply changed this to return -ENOMEM.

Signed-off-by: default avatarJaewon Kim <jaewon31.kim@samsung.com>
Acked-by: default avatarLaura Abbott <labbott@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e7954918

drivers/staging/android/ion/ion_cma_heap.c

+2 −4
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ 
#include "ion.h"

#include "ion_priv.h"



#define ION_CMA_ALLOCATE_FAILED -1



struct ion_cma_heap {

	struct ion_heap heap;

	struct device *dev;
@@ -59,7 +57,7 @@ static int ion_cma_allocate(struct ion_heap *heap, struct ion_buffer *buffer, 


	info = kzalloc(sizeof(struct ion_cma_buffer_info), GFP_KERNEL);

	if (!info)

		return ION_CMA_ALLOCATE_FAILED;

		return -ENOMEM;



	info->cpu_addr = dma_alloc_coherent(dev, len, &(info->handle),

						GFP_HIGHUSER | __GFP_ZERO);
@@ -88,7 +86,7 @@ static int ion_cma_allocate(struct ion_heap *heap, struct ion_buffer *buffer, 
	dma_free_coherent(dev, len, info->cpu_addr, info->handle);

err:

	kfree(info);

	return ION_CMA_ALLOCATE_FAILED;

	return -ENOMEM;

}



static void ion_cma_free(struct ion_buffer *buffer)