Merge "msm: sde: disable support for v4l2 event subscription"

This commit is contained in:
Linux Build Service Account 2017-11-22 19:51:17 -08:00 committed by Gerrit - the friendly Code Review server
commit a618c4e225

View file

@ -2009,6 +2009,18 @@ ioctl32_error:
}
#endif
static int sde_rotator_ctrl_subscribe_event(struct v4l2_fh *fh,
const struct v4l2_event_subscription *sub)
{
return -EINVAL;
}
static int sde_rotator_event_unsubscribe(struct v4l2_fh *fh,
const struct v4l2_event_subscription *sub)
{
return -EINVAL;
}
/* V4l2 ioctl handlers */
static const struct v4l2_ioctl_ops sde_rotator_ioctl_ops = {
.vidioc_querycap = sde_rotator_querycap,
@ -2033,8 +2045,8 @@ static const struct v4l2_ioctl_ops sde_rotator_ioctl_ops = {
.vidioc_s_parm = sde_rotator_s_parm,
.vidioc_default = sde_rotator_private_ioctl,
.vidioc_log_status = v4l2_ctrl_log_status,
.vidioc_subscribe_event = v4l2_ctrl_subscribe_event,
.vidioc_unsubscribe_event = v4l2_event_unsubscribe,
.vidioc_subscribe_event = sde_rotator_ctrl_subscribe_event,
.vidioc_unsubscribe_event = sde_rotator_event_unsubscribe,
};
/*