diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2012-01-27 16:21:10 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-02-14 16:38:52 -0200 |
| commit | 6d6604fa6643d15cd46f891b01084ecfd5d0fbec (patch) | |
| tree | d2e71755091ff451b2e2052db6baea088be7b86a /drivers | |
| parent | a26243b0e3726d2b39dc23dd2c8717c52a286af4 (diff) | |
| download | blackbird-op-linux-6d6604fa6643d15cd46f891b01084ecfd5d0fbec.tar.gz blackbird-op-linux-6d6604fa6643d15cd46f891b01084ecfd5d0fbec.zip | |
[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')
| -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) return 0; } -static int vidioc_subscribe_event(struct v4l2_fh *fh, - struct v4l2_event_subscription *sub) -{ - switch (sub->type) { - case V4L2_EVENT_CTRL: - return v4l2_event_subscribe(fh, sub, 0); - default: - return -EINVAL; - } -} - /* --- controls ---------------------------------------------- */ static int vivi_g_volatile_ctrl(struct v4l2_ctrl *ctrl) @@ -1203,7 +1192,7 @@ static const struct v4l2_ioctl_ops vivi_ioctl_ops = { .vidioc_streamon = vidioc_streamon, .vidioc_streamoff = vidioc_streamoff, .vidioc_log_status = v4l2_ctrl_log_status, - .vidioc_subscribe_event = vidioc_subscribe_event, + .vidioc_subscribe_event = v4l2_ctrl_subscribe_event, .vidioc_unsubscribe_event = v4l2_event_unsubscribe, }; |
