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

Commit 332733e7 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: kgsl: Making void pointers to void __user in adreno.c"

parents bd42ed7f 80144a12

drivers/gpu/msm/adreno.c

+3 −4
Original line number Diff line number Diff line
@@ -2132,7 +2132,7 @@ void adreno_ft_uninit_sysfs(struct kgsl_device *device) 


static int adreno_getproperty(struct kgsl_device *device,

				enum kgsl_property_type type,

				void *value,

				void __user *value,

				size_t sizebytes)

{

	int status = -EINVAL;
@@ -2230,7 +2230,7 @@ static int adreno_getproperty(struct kgsl_device *device, 


static int adreno_setproperty(struct kgsl_device *device,

				enum kgsl_property_type type,

				void *value,

				void __user *value,

				unsigned int sizebytes)

{

	int status = -EINVAL;
@@ -2243,8 +2243,7 @@ static int adreno_setproperty(struct kgsl_device *device, 
			if (sizebytes != sizeof(enable))

				break;



			if (copy_from_user(&enable, (void __user *) value,

				sizeof(enable))) {

			if (copy_from_user(&enable, value, sizeof(enable))) {

				status = -EFAULT;

				break;

			}

drivers/gpu/msm/kgsl_device.h

+2 −2
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ struct kgsl_functable { 
	int (*start) (struct kgsl_device *device);

	int (*stop) (struct kgsl_device *device);

	int (*getproperty) (struct kgsl_device *device,

		enum kgsl_property_type type, void *value,

		enum kgsl_property_type type, void __user *value,

		size_t sizebytes);

	int (*waittimestamp) (struct kgsl_device *device,

		struct kgsl_context *context, unsigned int timestamp,
@@ -128,7 +128,7 @@ struct kgsl_functable { 
	long (*ioctl) (struct kgsl_device_private *dev_priv,

		unsigned int cmd, void *data);

	int (*setproperty) (struct kgsl_device *device,

		enum kgsl_property_type type, void *value,

		enum kgsl_property_type type, void __user *value,

		unsigned int sizebytes);

	int (*postmortem_dump) (struct kgsl_device *device, int manual);

	void (*drawctxt_sched)(struct kgsl_device *device,