Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b88fa731 authored by Rom Lemarchand's avatar Rom Lemarchand Committed by Greg Kroah-Hartman
Browse files

ion: change ion_user_handle_t definition to int 



Turn ion_user_handle_t to int. This change reflects the underlying type
returned by the ion driver.

Signed-off-by: default avatarRom Lemarchand <romlem@google.com>
[jstultz: modified patch to apply to staging directory]
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 22b7f24d

drivers/staging/android/ion/ion.c

+4 −4
Original line number Diff line number Diff line
@@ -1139,7 +1139,7 @@ static long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
		if (IS_ERR(handle))

			return PTR_ERR(handle);



		data.handle = (ion_user_handle_t)handle->id;

		data.handle = handle->id;



		if (copy_to_user((void __user *)arg, &data, sizeof(data))) {

			ion_free(client, handle);
@@ -1156,7 +1156,7 @@ static long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
				   sizeof(struct ion_handle_data)))

			return -EFAULT;

		mutex_lock(&client->lock);

		handle = ion_uhandle_get(client, (int)data.handle);

		handle = ion_uhandle_get(client, data.handle);

		mutex_unlock(&client->lock);

		if (!handle)

			return -EINVAL;
@@ -1171,7 +1171,7 @@ static long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 


		if (copy_from_user(&data, (void __user *)arg, sizeof(data)))

			return -EFAULT;

		handle = ion_uhandle_get(client, (int)data.handle);

		handle = ion_uhandle_get(client, data.handle);

		data.fd = ion_share_dma_buf_fd(client, handle);

		if (copy_to_user((void __user *)arg, &data, sizeof(data)))

			return -EFAULT;
@@ -1191,7 +1191,7 @@ static long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) 
		if (IS_ERR(handle))

			ret = PTR_ERR(handle);

		else

			data.handle = (ion_user_handle_t)handle->id;

			data.handle = handle->id;



		if (copy_to_user((void __user *)arg, &data,

				 sizeof(struct ion_fd_data)))

drivers/staging/android/ion/ion.h

+2 −2
Original line number Diff line number Diff line
@@ -19,8 +19,7 @@ 


#include <linux/types.h>



struct ion_handle;

typedef struct ion_handle *ion_user_handle_t;

typedef int ion_user_handle_t;



/**

 * enum ion_heap_types - list of all possible types of heaps
@@ -65,6 +64,7 @@ enum ion_heap_type { 
					   caches must be managed manually */



#ifdef __KERNEL__

struct ion_handle;

struct ion_device;

struct ion_heap;

struct ion_mapper;