diff options
author | Konsta Holtta <kholtta@nvidia.com> | 2014-09-29 03:37:33 -0400 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2015-03-18 15:11:31 -0400 |
commit | 6b85e32d6c750c79264455636c2f8f55c409b51a (patch) | |
tree | 35c31f9cd59ba1a97ceadad6890e068cdfc17774 /drivers/gpu/nvgpu/gk20a | |
parent | 435cf045d7f856e90c9087403dfcbc2677a4575a (diff) |
gpu: nvgpu: fix -EINVAL retval in ioctls
Proper error number for invalid request number is EINVAL instead of
EFAULT, so change it in ioctl calls.
Change-Id: I8fddd34e012700550e9e30fe17ba7152b3a0417b
Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-on: http://git-master/r/542563
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/as_gk20a.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/channel_gk20a.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/tsg_gk20a.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/as_gk20a.c b/drivers/gpu/nvgpu/gk20a/as_gk20a.c index a1031b95..a2741fe8 100644 --- a/drivers/gpu/nvgpu/gk20a/as_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/as_gk20a.c | |||
@@ -219,7 +219,7 @@ long gk20a_as_dev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) | |||
219 | if ((_IOC_TYPE(cmd) != NVHOST_AS_IOCTL_MAGIC) || | 219 | if ((_IOC_TYPE(cmd) != NVHOST_AS_IOCTL_MAGIC) || |
220 | (_IOC_NR(cmd) == 0) || | 220 | (_IOC_NR(cmd) == 0) || |
221 | (_IOC_NR(cmd) > NVHOST_AS_IOCTL_LAST)) | 221 | (_IOC_NR(cmd) > NVHOST_AS_IOCTL_LAST)) |
222 | return -EFAULT; | 222 | return -EINVAL; |
223 | 223 | ||
224 | BUG_ON(_IOC_SIZE(cmd) > NVHOST_AS_IOCTL_MAX_ARG_SIZE); | 224 | BUG_ON(_IOC_SIZE(cmd) > NVHOST_AS_IOCTL_MAX_ARG_SIZE); |
225 | 225 | ||
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c index fdeb8265..34c95483 100644 --- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c | |||
@@ -2220,7 +2220,7 @@ long gk20a_channel_ioctl(struct file *filp, | |||
2220 | (_IOC_NR(cmd) == 0) || | 2220 | (_IOC_NR(cmd) == 0) || |
2221 | (_IOC_NR(cmd) > NVHOST_IOCTL_CHANNEL_LAST) || | 2221 | (_IOC_NR(cmd) > NVHOST_IOCTL_CHANNEL_LAST) || |
2222 | (_IOC_SIZE(cmd) > NVHOST_IOCTL_CHANNEL_MAX_ARG_SIZE)) | 2222 | (_IOC_SIZE(cmd) > NVHOST_IOCTL_CHANNEL_MAX_ARG_SIZE)) |
2223 | return -EFAULT; | 2223 | return -EINVAL; |
2224 | 2224 | ||
2225 | if (_IOC_DIR(cmd) & _IOC_WRITE) { | 2225 | if (_IOC_DIR(cmd) & _IOC_WRITE) { |
2226 | if (copy_from_user(buf, (void __user *)arg, _IOC_SIZE(cmd))) | 2226 | if (copy_from_user(buf, (void __user *)arg, _IOC_SIZE(cmd))) |
diff --git a/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c b/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c index 53fab0d9..d1560cad 100644 --- a/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/ctrl_gk20a.c | |||
@@ -172,7 +172,7 @@ long gk20a_ctrl_dev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg | |||
172 | if ((_IOC_TYPE(cmd) != NVHOST_GPU_IOCTL_MAGIC) || | 172 | if ((_IOC_TYPE(cmd) != NVHOST_GPU_IOCTL_MAGIC) || |
173 | (_IOC_NR(cmd) == 0) || | 173 | (_IOC_NR(cmd) == 0) || |
174 | (_IOC_NR(cmd) > NVHOST_GPU_IOCTL_LAST)) | 174 | (_IOC_NR(cmd) > NVHOST_GPU_IOCTL_LAST)) |
175 | return -EFAULT; | 175 | return -EINVAL; |
176 | 176 | ||
177 | BUG_ON(_IOC_SIZE(cmd) > NVHOST_GPU_IOCTL_MAX_ARG_SIZE); | 177 | BUG_ON(_IOC_SIZE(cmd) > NVHOST_GPU_IOCTL_MAX_ARG_SIZE); |
178 | 178 | ||
diff --git a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c index 686987c0..1fefb659 100644 --- a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c | |||
@@ -372,7 +372,7 @@ long gk20a_dbg_gpu_dev_ioctl(struct file *filp, unsigned int cmd, | |||
372 | if ((_IOC_TYPE(cmd) != NVHOST_DBG_GPU_IOCTL_MAGIC) || | 372 | if ((_IOC_TYPE(cmd) != NVHOST_DBG_GPU_IOCTL_MAGIC) || |
373 | (_IOC_NR(cmd) == 0) || | 373 | (_IOC_NR(cmd) == 0) || |
374 | (_IOC_NR(cmd) > NVHOST_DBG_GPU_IOCTL_LAST)) | 374 | (_IOC_NR(cmd) > NVHOST_DBG_GPU_IOCTL_LAST)) |
375 | return -EFAULT; | 375 | return -EINVAL; |
376 | 376 | ||
377 | BUG_ON(_IOC_SIZE(cmd) > NVHOST_DBG_GPU_IOCTL_MAX_ARG_SIZE); | 377 | BUG_ON(_IOC_SIZE(cmd) > NVHOST_DBG_GPU_IOCTL_MAX_ARG_SIZE); |
378 | 378 | ||
diff --git a/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c b/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c index 98e1ae2c..dedb4c8a 100644 --- a/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/tsg_gk20a.c | |||
@@ -213,7 +213,7 @@ long gk20a_tsg_dev_ioctl(struct file *filp, unsigned int cmd, | |||
213 | if ((_IOC_TYPE(cmd) != NVGPU_TSG_IOCTL_MAGIC) || | 213 | if ((_IOC_TYPE(cmd) != NVGPU_TSG_IOCTL_MAGIC) || |
214 | (_IOC_NR(cmd) == 0) || | 214 | (_IOC_NR(cmd) == 0) || |
215 | (_IOC_NR(cmd) > NVGPU_TSG_IOCTL_LAST)) | 215 | (_IOC_NR(cmd) > NVGPU_TSG_IOCTL_LAST)) |
216 | return -EFAULT; | 216 | return -EINVAL; |
217 | 217 | ||
218 | BUG_ON(_IOC_SIZE(cmd) > NVGPU_TSG_IOCTL_MAX_ARG_SIZE); | 218 | BUG_ON(_IOC_SIZE(cmd) > NVGPU_TSG_IOCTL_MAX_ARG_SIZE); |
219 | 219 | ||