diff options
| author | Andrew Lehmer <alehmer@google.com> | 2017-09-18 13:15:04 -0700 |
|---|---|---|
| committer | Andrew Lehmer <alehmer@google.com> | 2017-09-18 13:15:40 -0700 |
| commit | d979a206799253d38e50578cf126e681acd2e853 (patch) | |
| tree | cf72d39edec82ac5dc44d030b95993ee701cc9bb | |
| parent | 366f8478a8d61af531ecada870884b5f4be38987 (diff) | |
| parent | 69de80e6a35db96eaec482c691d45e31b4c716e7 (diff) | |
Merge branch 'android-msm-wahoo-4.4-oc-dr1-security-next' into android-msm-wahoo-4.4-oc-dr1android-8.0.0_r0.22
November 2017.2
Bug: 65558945
Change-Id: Ifd354a676077b109b0e4106921051f37e4a41f38
Signed-off-by: Andrew Lehmer <alehmer@google.com>
| -rw-r--r-- | drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c b/drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c index f7b42875c332..749dd4a405c9 100644 --- a/drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c +++ b/drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c @@ -3066,15 +3066,13 @@ end: return rc; } -static int msm_cpp_validate_ioctl_input(unsigned int cmd, void *arg, +static int msm_cpp_validate_input(unsigned int cmd, void *arg, struct msm_camera_v4l2_ioctl_t **ioctl_ptr) { switch (cmd) { case MSM_SD_SHUTDOWN: case MSM_SD_NOTIFY_FREEZE: case MSM_SD_UNNOTIFY_FREEZE: - case VIDIOC_MSM_CPP_IOMMU_ATTACH: - case VIDIOC_MSM_CPP_IOMMU_DETACH: break; default: { if (ioctl_ptr == NULL) { @@ -3149,7 +3147,7 @@ long msm_cpp_subdev_ioctl(struct v4l2_subdev *sd, return -EINVAL; } - rc = msm_cpp_validate_ioctl_input(cmd, arg, &ioctl_ptr); + rc = msm_cpp_validate_input(cmd, arg, &ioctl_ptr); if (rc != 0) { pr_err("input validation failed\n"); return rc; |