diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-11-22 19:51:17 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-11-22 19:51:16 -0800 |
| commit | a618c4e22506854e7e3f3c836f5955c7d54ecd49 (patch) | |
| tree | b4a000e3130b1270b116dfb311b824dc79cd74b4 | |
| parent | 070ac3c30f44aced26e919978a634ffefa3369f8 (diff) | |
| parent | e3f7d2ac8ac0b2a84e1e0161a1cf0147570f6447 (diff) | |
Merge "msm: sde: disable support for v4l2 event subscription"
| -rw-r--r-- | drivers/media/platform/msm/sde/rotator/sde_rotator_dev.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/drivers/media/platform/msm/sde/rotator/sde_rotator_dev.c b/drivers/media/platform/msm/sde/rotator/sde_rotator_dev.c index 08bbed147c86..76e1b60512d0 100644 --- a/drivers/media/platform/msm/sde/rotator/sde_rotator_dev.c +++ b/drivers/media/platform/msm/sde/rotator/sde_rotator_dev.c @@ -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, }; /* |