summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-07-18 03:06:57 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-07-18 03:06:57 -0700
commit95dbfdb0a5b9489eacd9abedda29da7936a977b5 (patch)
tree7386124763aa74e27aac63e17e0414f0b6cf342e
parent1f14d5b7858f59e28848ca6d1e37405f17258345 (diff)
parentba8d8654d45d8b865e5df118957a33dd2129924a (diff)
Merge "msm: sensor: actuator: add conditional check for ioctl"
-rw-r--r--drivers/media/platform/msm/camera_v2/sensor/actuator/msm_actuator.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/platform/msm/camera_v2/sensor/actuator/msm_actuator.c b/drivers/media/platform/msm/camera_v2/sensor/actuator/msm_actuator.c
index bc844bb87db5..b1bea12c2cc3 100644
--- a/drivers/media/platform/msm/camera_v2/sensor/actuator/msm_actuator.c
+++ b/drivers/media/platform/msm/camera_v2/sensor/actuator/msm_actuator.c
@@ -1707,6 +1707,10 @@ static long msm_actuator_subdev_do_ioctl(
parg = &actuator_data;
break;
}
+ break;
+ case VIDIOC_MSM_ACTUATOR_CFG:
+ pr_err("%s: invalid cmd 0x%x received\n", __func__, cmd);
+ return -EINVAL;
}
rc = msm_actuator_subdev_ioctl(sd, cmd, parg);