summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-09-13 10:58:06 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-09-13 10:58:05 -0700
commit581c8764e267227c88741b59c52c8456009fc587 (patch)
treeab22239137eba8910ca2b4a2e4494e76eb3df11f /drivers/media
parent5a5b79c5fc66c687b9572b0e2ccf7106afdf280d (diff)
parent40f659bfc00b0536bf414ef955873856c242cbda (diff)
Merge "msm: ais: Return -NOTTY on invalid ioctl command"
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/platform/msm/ais/msm.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/media/platform/msm/ais/msm.c b/drivers/media/platform/msm/ais/msm.c
index a3a742182e76..ccfdfba2ceee 100644
--- a/drivers/media/platform/msm/ais/msm.c
+++ b/drivers/media/platform/msm/ais/msm.c
@@ -731,6 +731,16 @@ static long msm_private_ioctl(struct file *file, void *fh,
if (!event_data)
return -EINVAL;
+ switch (cmd) {
+ case MSM_CAM_V4L2_IOCTL_NOTIFY:
+ case MSM_CAM_V4L2_IOCTL_CMD_ACK:
+ case MSM_CAM_V4L2_IOCTL_NOTIFY_DEBUG:
+ case MSM_CAM_V4L2_IOCTL_NOTIFY_ERROR:
+ break;
+ default:
+ return -ENOTTY;
+ }
+
memset(&event, 0, sizeof(struct v4l2_event));
session_id = event_data->session_id;
stream_id = event_data->stream_id;