summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorTroy Kisky <troy.kisky@boundarydevices.com>2013-02-13 16:02:23 -0700
committerPhilippe Schenker <philippe.schenker@toradex.com>2020-08-13 16:04:32 +0200
commit5e920d3d00ca8a86d6c4a3d8d932da47eb3d3ec2 (patch)
tree46c5ae4fcb2dc05b0ebd04b43da6e8438a0e8fab /drivers/media
parent0419fc00456f4690cba82264fb1aef840cfc20f1 (diff)
mxc_v4l2_capture: fix VIDIOC_ENUMSTD, return -EINVAL if index > 0
Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com> Acked-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit 8416153781d90d7153769310ea7b250166460f86) (cherry picked from commit bc387b6fd0e45132e951eaa79af1bfdc4c196ed0) (cherry picked from commit 55123f954668d63507030fc3a82a7ef6c9440ab0)
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/platform/mxc/capture/mxc_v4l2_capture.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c b/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c
index 936514db9944..8cc63f46fe95 100644
--- a/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c
+++ b/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c
@@ -2241,6 +2241,10 @@ static long mxc_v4l_do_ioctl(struct file *file,
case VIDIOC_ENUMSTD: {
struct v4l2_standard *e = arg;
pr_debug(" case VIDIOC_ENUMSTD\n");
+ if (e->index > 0) {
+ retval = -EINVAL;
+ break;
+ }
*e = cam->standard;
break;
}