diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2012-01-27 14:21:10 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-02-14 13:38:52 -0500 |
commit | 6d6604fa6643d15cd46f891b01084ecfd5d0fbec (patch) | |
tree | d2e71755091ff451b2e2052db6baea088be7b86a /drivers/media/video/vivi.c | |
parent | a26243b0e3726d2b39dc23dd2c8717c52a286af4 (diff) |
[media] vivi: use v4l2_ctrl_subscribe_event
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/vivi.c')
-rw-r--r-- | drivers/media/video/vivi.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c index 64a3b5276ccf..5e8b0710105b 100644 --- a/drivers/media/video/vivi.c +++ b/drivers/media/video/vivi.c | |||
@@ -1001,17 +1001,6 @@ static int vidioc_s_input(struct file *file, void *priv, unsigned int i) | |||
1001 | return 0; | 1001 | return 0; |
1002 | } | 1002 | } |
1003 | 1003 | ||
1004 | static int vidioc_subscribe_event(struct v4l2_fh *fh, | ||
1005 | struct v4l2_event_subscription *sub) | ||
1006 | { | ||
1007 | switch (sub->type) { | ||
1008 | case V4L2_EVENT_CTRL: | ||
1009 | return v4l2_event_subscribe(fh, sub, 0); | ||
1010 | default: | ||
1011 | return -EINVAL; | ||
1012 | } | ||
1013 | } | ||
1014 | |||
1015 | /* --- controls ---------------------------------------------- */ | 1004 | /* --- controls ---------------------------------------------- */ |
1016 | 1005 | ||
1017 | static int vivi_g_volatile_ctrl(struct v4l2_ctrl *ctrl) | 1006 | static int vivi_g_volatile_ctrl(struct v4l2_ctrl *ctrl) |
@@ -1203,7 +1192,7 @@ static const struct v4l2_ioctl_ops vivi_ioctl_ops = { | |||
1203 | .vidioc_streamon = vidioc_streamon, | 1192 | .vidioc_streamon = vidioc_streamon, |
1204 | .vidioc_streamoff = vidioc_streamoff, | 1193 | .vidioc_streamoff = vidioc_streamoff, |
1205 | .vidioc_log_status = v4l2_ctrl_log_status, | 1194 | .vidioc_log_status = v4l2_ctrl_log_status, |
1206 | .vidioc_subscribe_event = vidioc_subscribe_event, | 1195 | .vidioc_subscribe_event = v4l2_ctrl_subscribe_event, |
1207 | .vidioc_unsubscribe_event = v4l2_event_unsubscribe, | 1196 | .vidioc_unsubscribe_event = v4l2_event_unsubscribe, |
1208 | }; | 1197 | }; |
1209 | 1198 | ||