summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-08-08 09:02:14 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-08-08 09:02:14 -0700
commitf43cc12df045dbc13bd284c66cc473c39fe9e0a2 (patch)
treed34084feac45572e4a964f86ae64cee239bb0b55
parent7dbbe1224f667d4afc74289e7c8a3794442cf876 (diff)
parentba30a633b6855cc410ea702e506dde3b2215d234 (diff)
Merge "msm: sensor: ois: add conditional check for ioctl"
-rw-r--r--drivers/media/platform/msm/camera_v2/sensor/ois/msm_ois.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/platform/msm/camera_v2/sensor/ois/msm_ois.c b/drivers/media/platform/msm/camera_v2/sensor/ois/msm_ois.c
index bfb15846e73c..84266691f9b8 100644
--- a/drivers/media/platform/msm/camera_v2/sensor/ois/msm_ois.c
+++ b/drivers/media/platform/msm/camera_v2/sensor/ois/msm_ois.c
@@ -818,6 +818,10 @@ static long msm_ois_subdev_do_ioctl(
parg = &ois_data;
break;
}
+ break;
+ case VIDIOC_MSM_OIS_CFG:
+ pr_err("%s: invalid cmd 0x%x received\n", __func__, cmd);
+ return -EINVAL;
}
rc = msm_ois_subdev_ioctl(sd, cmd, parg);