summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTroy Kisky <troy.kisky@boundarydevices.com>2013-02-13 16:02:23 -0700
committerTroy Kisky <troy.kisky@boundarydevices.com>2013-02-19 18:44:32 -0700
commitf8b5a574330042fd750294ea524be689dda4d792 (patch)
tree2c6209cd3fbd8ce3062e2d31a0455309864900d3
parent35a7da60bdd1e6af2667be89a109ce47e92335dd (diff)
mxc_v4l2_capture: fix VIDIOC_ENUMSTD, return -EINVAL if index > 0
-rw-r--r--drivers/media/video/mxc/capture/mxc_v4l2_capture.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/video/mxc/capture/mxc_v4l2_capture.c b/drivers/media/video/mxc/capture/mxc_v4l2_capture.c
index 3e9346d356cd..8d46a14fa0e4 100644
--- a/drivers/media/video/mxc/capture/mxc_v4l2_capture.c
+++ b/drivers/media/video/mxc/capture/mxc_v4l2_capture.c
@@ -2220,6 +2220,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;
}