From 543247cd01b74a9a2f8efb908569c64ba614a97f Mon Sep 17 00:00:00 2001 From: securecrt Date: Wed, 25 Jul 2012 19:35:35 +0800 Subject: [PATCH] msm: kgsl: return correct error code for unknown ioctls Unknown ioctl code errors are supposed to be ENOIOCTLCMD, not EINVAL. --- drivers/gpu/msm/adreno.c | 3 ++- drivers/gpu/msm/kgsl.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/msm/adreno.c b/drivers/gpu/msm/adreno.c index 8f35effd..56efea08 100755 --- a/drivers/gpu/msm/adreno.c +++ b/drivers/gpu/msm/adreno.c @@ -415,6 +415,7 @@ adreno_identify_gpu(struct adreno_device *adreno_dev) adreno_dev->pm4_fwfile = adreno_gpulist[i].pm4fw; adreno_dev->istore_size = adreno_gpulist[i].istore_size; adreno_dev->pix_shader_start = adreno_gpulist[i].pix_shader_start; + adreno_dev->instruction_size = adreno_gpulist[i].instruction_size; } static int __devinit @@ -1204,7 +1205,7 @@ static long adreno_ioctl(struct kgsl_device_private *dev_priv, default: KGSL_DRV_INFO(dev_priv->device, "invalid ioctl code %08x\n", cmd); - result = -EINVAL; + result = -ENOIOCTLCMD; break; } return result; diff --git a/drivers/gpu/msm/kgsl.c b/drivers/gpu/msm/kgsl.c index 65efe2f4..50fb5515 100755 --- a/drivers/gpu/msm/kgsl.c +++ b/drivers/gpu/msm/kgsl.c @@ -1964,7 +1964,7 @@ static long kgsl_ioctl(struct file *filep, unsigned int cmd, unsigned long arg) if (!func) { KGSL_DRV_INFO(dev_priv->device, "invalid ioctl code %08x\n", cmd); - ret = -EINVAL; + ret = -ENOIOCTLCMD; goto done; } lock = 1;